From c1b66c4330e736982ef981dfad76d8b9b488945e Mon Sep 17 00:00:00 2001 From: Tim Daly Date: Mon, 27 Apr 2015 22:07:57 -0400 Subject: [PATCH] src/interp/vmlisp.lisp remove/distribute functions More functions are removed or distributed to other files. --- changelog | 42 ++ patch | 6 +- src/axiom-website/patches.html | 2 + src/interp/br-con.lisp.pamphlet | 1184 ++++++++++++++++++------------------ src/interp/c-doc.lisp.pamphlet | 62 +- src/interp/c-util.lisp.pamphlet | 18 +- src/interp/category.lisp.pamphlet | 6 +- src/interp/clam.lisp.pamphlet | 26 +- src/interp/fortcall.lisp.pamphlet | 24 +- src/interp/functor.lisp.pamphlet | 18 +- src/interp/g-timer.lisp.pamphlet | 24 +- src/interp/g-util.lisp.pamphlet | 6 +- src/interp/hashcode.lisp.pamphlet | 4 +- src/interp/i-analy.lisp.pamphlet | 4 +- src/interp/i-coerce.lisp.pamphlet | 12 +- src/interp/i-coerfn.lisp.pamphlet | 18 +- src/interp/i-funsel.lisp.pamphlet | 14 +- src/interp/i-map.lisp.pamphlet | 8 +- src/interp/i-output.lisp.pamphlet | 552 +++++++++--------- src/interp/i-spec1.lisp.pamphlet | 4 +- src/interp/i-spec2.lisp.pamphlet | 8 +- src/interp/i-util.lisp.pamphlet | 2 +- src/interp/match.lisp.pamphlet | 44 +- src/interp/msgdb.lisp.pamphlet | 48 +- src/interp/nag-c02.lisp.pamphlet | 8 +- src/interp/nag-c05.lisp.pamphlet | 12 +- src/interp/nag-d02.lisp.pamphlet | 44 +- src/interp/nag-e01.lisp.pamphlet | 20 +- src/interp/nag-e02.lisp.pamphlet | 94 ++-- src/interp/nag-e04.lisp.pamphlet | 52 +- src/interp/nag-f01.lisp.pamphlet | 4 +- src/interp/nag-f04.lisp.pamphlet | 6 +- src/interp/newfort.lisp.pamphlet | 54 +- src/interp/nruncomp.lisp.pamphlet | 22 +- src/interp/nrunfast.lisp.pamphlet | 30 +- src/interp/nrungo.lisp.pamphlet | 8 +- src/interp/nrunopt.lisp.pamphlet | 98 ++-- src/interp/parsing.lisp.pamphlet | 2 +- src/interp/record.lisp.pamphlet | 6 +- src/interp/server.lisp.pamphlet | 2 +- src/interp/slam.lisp.pamphlet | 4 +- src/interp/template.lisp.pamphlet | 24 +- src/interp/topics.lisp.pamphlet | 8 +- src/interp/vmlisp.lisp.pamphlet | 65 +-- 44 files changed, 1344 insertions(+), 1355 deletions(-) diff --git a/changelog b/changelog index f6e5ac2..280ea6a 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,45 @@ +20150427 tpd src/axiom-website/patches.html 20150427.01.tpd.patch +20150427 tpd src/interp/br-con.lisp shrink vmlisp.lisp +20150427 tpd src/interp/c-doc.lisp shrink vmlisp.lisp +20150427 tpd src/interp/c-util.lisp shrink vmlisp.lisp +20150427 tpd src/interp/category.lisp shrink vmlisp.lisp +20150427 tpd src/interp/clam.lisp shrink vmlisp.lisp +20150427 tpd src/interp/fortcall.lisp shrink vmlisp.lisp +20150427 tpd src/interp/functor.lisp shrink vmlisp.lisp +20150427 tpd src/interp/g-timer.lisp shrink vmlisp.lisp +20150427 tpd src/interp/g-util.lisp shrink vmlisp.lisp +20150427 tpd src/interp/hashcode.lisp shrink vmlisp.lisp +20150427 tpd src/interp/i-analy.lisp shrink vmlisp.lisp +20150427 tpd src/interp/i-coerce.lisp shrink vmlisp.lisp +20150427 tpd src/interp/i-coerfn.lisp shrink vmlisp.lisp +20150427 tpd src/interp/i-funsel.lisp shrink vmlisp.lisp +20150427 tpd src/interp/i-map.lisp shrink vmlisp.lisp +20150427 tpd src/interp/i-output.lisp shrink vmlisp.lisp +20150427 tpd src/interp/i-spec1.lisp shrink vmlisp.lisp +20150427 tpd src/interp/i-spec2.lisp shrink vmlisp.lisp +20150427 tpd src/interp/i-util.lisp shrink vmlisp.lisp +20150427 tpd src/interp/match.lisp shrink vmlisp.lisp +20150427 tpd src/interp/msgdb.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nag-c02.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nag-c05.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nag-d02.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nag-e01.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nag-e02.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nag-e04.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nag-f01.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nag-f04.lisp shrink vmlisp.lisp +20150427 tpd src/interp/newfort.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nruncomp.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nrunfast.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nrungo.lisp shrink vmlisp.lisp +20150427 tpd src/interp/nrunopt.lisp shrink vmlisp.lisp +20150427 tpd src/interp/parsing.lisp shrink vmlisp.lisp +20150427 tpd src/interp/record.lisp shrink vmlisp.lisp +20150427 tpd src/interp/server.lisp shrink vmlisp.lisp +20150427 tpd src/interp/slam.lisp shrink vmlisp.lisp +20150427 tpd src/interp/template.lisp shrink vmlisp.lisp +20150427 tpd src/interp/topics.lisp shrink vmlisp.lisp +20150427 tpd src/interp/vmlisp.lisp shrink vmlisp.lisp 20150425 tpd src/axiom-website/patches.html 20150425.02.tpd.patch 20150425 tpd src/interp/vmlisp.lisp move/collect/reorder algebra support code 20150425 tpd src/axiom-website/patches.html 20150425.01.tpd.patch diff --git a/patch b/patch index 638a197..85dd2fd 100644 --- a/patch +++ b/patch @@ -1,5 +1,3 @@ -books/bookvol5 move/collect/reorder algebra support code - -The Common Lisp Algebra Support chapter contains functions which -are used in the algebra. These were collected and reordered by domain. +src/interp/vmlisp.lisp remove/distribute functions +More functions are removed or distributed to other files. diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html index 53c6137..0de393a 100644 --- a/src/axiom-website/patches.html +++ b/src/axiom-website/patches.html @@ -5038,6 +5038,8 @@ books/bookvol5 add )license command
books/bookvol5 move/collect/reorder algebra support code
20150425.02.tpd.patch books/bookvol5 move/collect/reorder algebra support code
+20150427.01.tpd.patch +src/interp/vmlisp.lisp shrink vmlisp.lisp
diff --git a/src/interp/br-con.lisp.pamphlet b/src/interp/br-con.lisp.pamphlet index c8f8ae5..b98321d 100644 --- a/src/interp/br-con.lisp.pamphlet +++ b/src/interp/br-con.lisp.pamphlet @@ -18,7 +18,7 @@ ; --positions for tick(1), dashes(2), and address(9), i.e. 12 ; TERPRI $outStream -(DEFUN |writedb| (|u|) +(defun |writedb| (|u|) (declare (special |$outStream|)) (COND ((NULL (STRINGP |u|)) NIL) @@ -30,7 +30,7 @@ ; addPatchesToLongLines(STRCONC('"--",SUBSTRING(s,n,nil)),n)) ; s -(DEFUN |addPatchesToLongLines| (|s| |n|) +(defun |addPatchesToLongLines| (|s| |n|) (COND ((> (|#| |s|) |n|) (STRCONC (SUBSTRING |s| 0 |n|) @@ -56,7 +56,7 @@ ; sayBrightly ['"(",$conname,'" documentation) missing right brace--> ",:tail] ; if count ^= 0 or missingLeft then pp comments -(DEFUN |checkCommentsForBraces| (|kind| |sop| |sigpart| |comments|) +(defun |checkCommentsForBraces| (|kind| |sop| |sigpart| |comments|) (PROG (|c| |count| |missingLeft| |tail|) (declare (special |$conname|)) (RETURN @@ -69,7 +69,7 @@ (SPADLET |c| (ELT |comments| |i|)) (COND ((BOOT-EQUAL |c| (|char| '{)) - (SPADLET |count| (PLUS |count| 1))) + (SPADLET |count| (+ |count| 1))) ((BOOT-EQUAL |c| (|char| '})) (SPADLET |count| (SPADDIFFERENCE |count| 1)) @@ -121,7 +121,7 @@ ; if args then RPLACD(CDR entry,PUTALIST(CDDR entry,'constructorArgs,args)) ; 'done -(DEFUN |dbAugmentConstructorDataTable| () +(defun |dbAugmentConstructorDataTable| () (PROG (|instream| |fp| |line| |cname| |entry| |name| |abb| |args|) (RETURN (SEQ (PROGN @@ -162,7 +162,7 @@ ; isExistingFile pathname => INTERN STRCONC(sname,'"XmpPage") ; nil -(DEFUN |dbHasExamplePage| (|conname|) +(defun |dbHasExamplePage| (|conname|) (PROG (|sname| |abb| |ucname| |pathname|) (RETURN (PROGN @@ -192,7 +192,7 @@ ; SHUT instream ; STRCONC(line, "STRCONC"/NREVERSE xtralines) -(DEFUN |dbReadComments| (|n|) +(defun |dbReadComments| (|n|) (PROG (|instream| |line| |x| |k| |j| |xtralines|) (RETURN (SEQ (COND @@ -205,7 +205,7 @@ (FILE-POSITION |instream| |n|) (SPADLET |line| (read-line |instream|)) (SPADLET |k| (|dbTickIndex| |line| 1 1)) - (SPADLET |line| (SUBSTRING |line| (PLUS |k| 1) NIL)) + (SPADLET |line| (SUBSTRING |line| (+ |k| 1) NIL)) (DO () ((NULL (AND (NULL (EOFP |instream|)) (SPADLET |x| (read-line |instream|)) @@ -213,15 +213,15 @@ (SPADLET |j| (|dbTickIndex| |x| 1 1)) (> |k| |j|) (BOOT-EQUAL - (ELT |x| (SPADLET |j| (PLUS |j| 1))) + (ELT |x| (SPADLET |j| (+ |j| 1))) (|char| '-)) (BOOT-EQUAL (ELT |x| - (SPADLET |j| (PLUS |j| 1))) + (SPADLET |j| (+ |j| 1))) (|char| '-)))) NIL) (SEQ (EXIT (SPADLET |xtralines| (CONS - (SUBSTRING |x| (PLUS |j| 1) NIL) + (SUBSTRING |x| (+ |j| 1) NIL) |xtralines|))))) (SHUT |instream|) (STRCONC |line| @@ -273,7 +273,7 @@ ; SHUT comstream ; OBEY '"rm olibdb.text" -(DEFUN |dbSplitLibdb| () +(defun |dbSplitLibdb| () (PROG (|instream| |outstream| |comstream| |line| |outP| |comP| |LETTMP#1| |prefix| |comments|) (declare (special |$tick|)) @@ -335,14 +335,14 @@ ; n = 1 => [SUBSTRING(line,0,k),:dbSpreadComments(SUBSTRING(line,k + 1,nil),0)] ; dbSplit(line,n - 1,k) -(DEFUN |dbSplit| (|line| |n| |k|) +(defun |dbSplit| (|line| |n| |k|) (declare (special |$tick|)) (PROGN - (SPADLET |k| (|charPosition| |$tick| |line| (PLUS |k| 1))) + (SPADLET |k| (|charPosition| |$tick| |line| (+ |k| 1))) (COND ((EQL |n| 1) (CONS (SUBSTRING |line| 0 |k|) - (|dbSpreadComments| (SUBSTRING |line| (PLUS |k| 1) NIL) 0))) + (|dbSpreadComments| (SUBSTRING |line| (+ |k| 1) NIL) 0))) ('T (|dbSplit| |line| (SPADDIFFERENCE |n| 1) |k|))))) ;dbSpreadComments(line,n) == @@ -354,17 +354,17 @@ ; [STRCONC(SUBSTRING(line,n,k - n),first u),:rest u] ; [SUBSTRING(line,n,k - n),:dbSpreadComments(SUBSTRING(line,k,nil),0)] -(DEFUN |dbSpreadComments| (|line| |n|) +(defun |dbSpreadComments| (|line| |n|) (PROG (|k| |u|) (RETURN (COND ((BOOT-EQUAL |line| "") NIL) ('T - (SPADLET |k| (|charPosition| (|char| '-) |line| (PLUS |n| 2))) + (SPADLET |k| (|charPosition| (|char| '-) |line| (+ |n| 2))) (COND ((>= |k| (MAXINDEX |line|)) (CONS (SUBSTRING |line| |n| NIL) NIL)) - ((NEQUAL (ELT |line| (PLUS |k| 1)) (|char| '-)) + ((NEQUAL (ELT |line| (+ |k| 1)) (|char| '-)) (SPADLET |u| (|dbSpreadComments| |line| |k|)) (CONS (STRCONC (SUBSTRING |line| |n| (SPADDIFFERENCE |k| |n|)) @@ -425,7 +425,7 @@ ; SHUT htstream ; SHUT $outStream -(DEFUN |buildGloss| () +(defun |buildGloss| () (PROG (|$constructorName| |$exposeFlag| |$outStream| |$x| |$attribute?| |pathname| |instream| |keypath| |outstream| |htpath| |htstream| |defpath| |defstream| |pairs| |name| @@ -543,7 +543,7 @@ ; MAXINDEX line > 500 => [SUBSTRING(line,0,500),:spreadGlossText(SUBSTRING(line,500,nil))] ; [line] -(DEFUN |spreadGlossText| (|line|) +(defun |spreadGlossText| (|line|) (COND ((BOOT-EQUAL |line| "") NIL) ((> (MAXINDEX |line|) 500) @@ -581,7 +581,7 @@ ; text := [SUBSTRING(line,n + 1,nil),:text] ; ASSOCRIGHT listSort(function GLESSEQP,[[DOWNCASE key,key,:def] for key in keys for def in text]) -(DEFUN |getGlossLines| (|instream|) +(defun |getGlossLines| (|instream|) (PROG (|line| |n| |last| |fill| |lastLineHadTick| |keys| |text|) (declare (special |$charBlank| |$tick|)) (RETURN @@ -630,7 +630,7 @@ (SPADLET |text| (CONS (SUBSTRING |line| - (PLUS |n| 1) NIL) + (+ |n| 1) NIL) |text|)))))))))) (ASSOCRIGHT (|listSort| #'GLESSEQP @@ -675,7 +675,7 @@ ; for x in allConstructors() | isDefaultPackageName x repeat ; HPUT($usersTb,x,getDefaultPackageClients x) ; $usersTb -(DEFUN |mkUsersHashTable| () +(defun |mkUsersHashTable| () (PROG (|name|) (declare (special |$usersTb|)) (RETURN @@ -731,7 +731,7 @@ ; acc := UNION([CAAR x for x in domainsOf([catAncestor],nil)],acc) ; listSort(function GLESSEQP,acc) -(DEFUN |getDefaultPackageClients| (|con|) +(defun |getDefaultPackageClients| (|con|) (PROG (|s| |catname| |catAncestor| |pakname| |acc|) (RETURN (SEQ (PROGN @@ -799,7 +799,7 @@ ; HPUT($depTb,k,listSort(function GLESSEQP,HGET($depTb,k))) ; $depTb -(DEFUN |mkDependentsHashTable| () +(defun |mkDependentsHashTable| () (declare (special |$depTb|)) (SEQ (PROGN (SPADLET |$depTb| (MAKE-HASH-TABLE)) @@ -838,7 +838,7 @@ ; constructor? first x => [first x,:fn rest x] ; fn rest x -(DEFUN |getArgumentConstructors,gn| (|x|) +(defun |getArgumentConstructors,gn| (|x|) (PROG (|r|) (RETURN (SEQ (IF (ATOM |x|) (EXIT NIL)) @@ -851,7 +851,7 @@ (|getArgumentConstructors,fn| (CDR |x|))))) (EXIT (|getArgumentConstructors,fn| (CDR |x|))))))) -(DEFUN |getArgumentConstructors,fn| (|u|) +(defun |getArgumentConstructors,fn| (|u|) (PROG () (RETURN (SEQ (PROG (G168900) @@ -866,7 +866,7 @@ (|getArgumentConstructors,gn| |x|)))))))))))) -(DEFUN |getArgumentConstructors| (|con|) +(defun |getArgumentConstructors| (|con|) (PROG (|argtypes|) (RETURN (PROGN @@ -903,7 +903,7 @@ ; systemError '"bad argument in template" ; listSort(function GLESSEQP,SUBLISLIS(rest conform,$FormalMapVariableList,u)) -(DEFUN |getImports,import| (|x| |template|) +(defun |getImports,import| (|x| |template|) (PROG (|op| |args| |ISTMP#1| |x1| |x2|) (RETURN (SEQ (IF (AND (CONSP |x|) @@ -1038,7 +1038,7 @@ (EXIT (|systemError| "bad argument in template")))))) -(DEFUN |getImports| (|conname|) +(defun |getImports| (|conname|) (PROG (|conform| |infovec| |template| |ISTMP#1| |op| |u|) (RETURN (SEQ (PROGN @@ -1094,7 +1094,7 @@ ; acc := [:explodeIfs x,:acc] ; NREVERSE acc -(DEFUN |getParentsFor| (|cname| |formalParams| |constructorCategory|) +(defun |getParentsFor| (|cname| |formalParams| |constructorCategory|) (PROG (|formals| |constructorForm| |acc|) (declare (special |$TriangleVariableList|)) (RETURN @@ -1132,7 +1132,7 @@ ; HPUT($parentsCache,con,parents) ; parents -(DEFUN |parentsOf| (|con|) +(defun |parentsOf| (|con|) (PROG (|parents|) (declare (special |$parentsCache|)) (RETURN @@ -1152,7 +1152,7 @@ ; parents ; SUBLISLIS(argl, newArgl, parents) -(DEFUN |parentsOfForm| (G169070) +(defun |parentsOfForm| (G169070) (PROG (|op| |argl| |parents| |newArgl|) (RETURN (PROGN @@ -1177,7 +1177,7 @@ ; acc := [:explodeIfs x,:acc] ; NREVERSE acc -(DEFUN |getParentsForDomain| (|domname|) +(defun |getParentsForDomain| (|domname|) (PROG (|acc|) (declare (special |$TriangleVariableList|)) (RETURN @@ -1223,7 +1223,7 @@ ; a is ['IF,q,b,:.] => fn(MKPF([p,q],'AND),b,nil) ; [[a,:p]] -(DEFUN |explodeIfs,gn| (|p| |a|) +(defun |explodeIfs,gn| (|p| |a|) (PROG (|ISTMP#1| |q| |ISTMP#2| |b|) (RETURN (SEQ (IF (AND (CONSP |a|) (EQ (QCAR |a|) 'IF) @@ -1241,7 +1241,7 @@ (MKPF (CONS |p| (CONS |q| NIL)) 'AND) |b| NIL))) (EXIT (CONS (CONS |a| |p|) NIL)))))) -(DEFUN |explodeIfs,fn| (|p| |a| |b|) +(defun |explodeIfs,fn| (|p| |a| |b|) (PROG () (RETURN (SEQ (APPEND (PROG (G169165) @@ -1266,7 +1266,7 @@ (|explodeIfs,gn| (CONS 'NOT (CONS |p| NIL)) |y|))))))))))))) -(DEFUN |explodeIfs| (|x|) +(defun |explodeIfs| (|x|) (PROG (|ISTMP#1| |p| |ISTMP#2| |a| |ISTMP#3| |b|) (RETURN (COND @@ -1305,7 +1305,7 @@ ; nil ; [u] -(DEFUN |folks| (|u|) +(defun |folks| (|u|) (PROG (|op| |v| |a| |ISTMP#1| |p| |ISTMP#2| |q| |ISTMP#3| |r| |q1| |r1|) (RETURN @@ -1379,7 +1379,7 @@ ; SUBLISLIS(argl, newArgl, cats) ; 'notAvailable -(DEFUN |descendantsOf| (|conform| |domform|) +(defun |descendantsOf| (|conform| |domform|) (PROG (|conname| |cats| |op| |argl| |newArgl|) (RETURN (COND @@ -1402,7 +1402,7 @@ ; [pair for pair in descendantsOf(conform,nil) | ; childAssoc(conform,parentsOfForm first pair)] -(DEFUN |childrenOf| (|conform|) +(defun |childrenOf| (|conform|) (PROG () (RETURN (SEQ (PROG (G169312) @@ -1424,7 +1424,7 @@ ; u := assocCar(opOf form, alist) => childArgCheck(argl,rest CAR u) and u ; nil -(DEFUN |childAssoc| (|form| |alist|) +(defun |childAssoc| (|form| |alist|) (PROG (|argl| |u|) (RETURN (COND @@ -1435,7 +1435,7 @@ ;assocCar(x, al) == or/[pair for pair in al | x = CAAR pair] -(DEFUN |assocCar| (|x| |al|) +(defun |assocCar| (|x| |al|) (PROG () (RETURN (SEQ (PROG (G169334) @@ -1457,7 +1457,7 @@ ; isSharpVar y => i = POSN1(y, $FormalMapVariableList) ; false -(DEFUN |childArgCheck| (|argl| |nargl|) +(defun |childArgCheck| (|argl| |nargl|) (PROG () (RETURN (SEQ (PROG (G169355) @@ -1509,7 +1509,7 @@ ; [left,:right] ; computeAncestorsOf(conform,domform) -(DEFUN |ancestorsOf| (|conform| |domform|) +(defun |ancestorsOf| (|conform| |domform|) (PROG (|conname| |alist| |argl| |a| |b| |left| |right|) (RETURN (SEQ (COND @@ -1573,7 +1573,7 @@ ; for pair in HGET($if,op) repeat acc := [pair,:acc] ; NREVERSE acc -(DEFUN |computeAncestorsOf| (|conform| |domform|) +(defun |computeAncestorsOf| (|conform| |domform|) (PROG (|$done| |$if| |acc|) (DECLARE (SPECIAL |$done| |$if|)) (RETURN @@ -1622,7 +1622,7 @@ ; ancestorsRecur(newform,newdomform,newPred,false) ; HPUT($done,conform,pred) --mark as already processed -(DEFUN |ancestorsRecur| (|conform| |domform| |pred| |firstTime?|) +(defun |ancestorsRecur| (|conform| |domform| |pred| |firstTime?|) (PROG (|op| |originalConform| |parents| |newform| |newdomform| |p| |newPred|) (declare (special |$done| |$lisplibParents|)) @@ -1689,7 +1689,7 @@ ; RPLACD(existingNode,quickOr(CDR existingNode,pred)) ; HPUT($if,op,[[form,:pred],:alist]) -(DEFUN |ancestorsAdd| (|pred| |form|) +(defun |ancestorsAdd| (|pred| |form|) (PROG (|op| |alist| |existingNode|) (declare (special |$if|)) (RETURN @@ -1714,7 +1714,7 @@ ; s := [[CAR pair,:GETDATABASE(pair,'HASCATEGORY)] for pair in s] ; transKCatAlist(conform,domname,listSort(function GLESSEQP,s)) -(DEFUN |domainsOf| (&REST G169550 &AUX |options| |domname| |conform|) +(defun |domainsOf| (&REST G169550 &AUX |options| |domname| |conform|) (DSETQ (|conform| |domname| . |options|) G169550) (PROG (|conname| |anc| |u| |s|) (declare (special |$hasArgList| *hascategory-hash*)) @@ -1779,7 +1779,7 @@ ; alist := insertShortAlist(key,newItem,alist) ; transKCatAlist(conform,domname,listSort(function GLESSEQP,alist)) -(DEFUN |catsOf| (&REST G169598 &AUX |options| |domname| |conform|) +(defun |catsOf| (&REST G169598 &AUX |options| |domname| |conform|) (DSETQ (|conform| |domname| . |options|) G169598) (PROG (|conname| |op| |args| |pred| |newItem| |alist|) (declare (special |$hasArgList|)) @@ -1871,7 +1871,7 @@ ; RPLACD(pair,sublisFormal(KDR leftForm,CDR pair)) ; s -(DEFUN |transKCatAlist| (|conform| |domname| |s|) +(defun |transKCatAlist| (|conform| |domname| |s|) (PROG (|domargs| |match?| |farglist| |args| |pred| |hasArgsForm?| |subargs| |hpred| |npred| |acc| |leftForm|) (RETURN @@ -2014,7 +2014,7 @@ ;-- we can find that if B has special value C, it can ; systemError subargs -(DEFUN |mkHasArgsPred| (|subargs|) (|systemError| |subargs|)) +(defun |mkHasArgsPred| (|subargs|) (|systemError| |subargs|)) ;sublisFormal(args,exp,:options) == main where ; main == --use only on LIST structures; see also sublisFormalAlist @@ -2039,7 +2039,7 @@ ; x ; x -(DEFUN |sublisFormal,sublisFormal1| (|args| |x| |n|) +(defun |sublisFormal,sublisFormal1| (|args| |x| |n|) (PROG (|.| |acc| |y| |r| |nd| |j|) (declare (special |$formals|)) (RETURN @@ -2090,7 +2090,7 @@ (EXIT |x|)))) (EXIT |x|))))) -(DEFUN |sublisFormal| (&REST G169785 &AUX |options| |exp| |args|) +(defun |sublisFormal| (&REST G169785 &AUX |options| |exp| |args|) (DSETQ (|args| |exp| . |options|) G169785) (PROG (|$formals|) (DECLARE (SPECIAL |$formals|)) @@ -2113,7 +2113,7 @@ ; HPUT($defaultPackageNamesHT,nam,true) ; $defaultPackageNamesHT -(DEFUN |buildDefaultPackageNamesHT| () +(defun |buildDefaultPackageNamesHT| () (declare (special |$defaultPackageNamesHT|)) (SEQ (PROGN (SPADLET |$defaultPackageNamesHT| (MAKE-HASH-TABLE)) @@ -2145,7 +2145,7 @@ ; showFrom dom ; showImp dom -(DEFUN |showSummary| (|dom|) +(defun |showSummary| (|dom|) (PROGN (|showPredicates| |dom|) (|showAttributes| |dom|) @@ -2199,7 +2199,7 @@ ; sayBrightly ["Not exported: "] ; u := showDomainsOp1(u,key) -(DEFUN |showImp| (&REST G169917 &AUX |options| |dom|) +(defun |showImp| (&REST G169917 &AUX |options| |dom|) (DSETQ (|dom| . |options|) G169917) (PROG (|$predicateList| |missingOnlyFlag| |nam| |predVector| |domexports| |unexports| |defexports| |nowheres| @@ -2329,7 +2329,7 @@ ; sayBrightly concat('"From ",form2String conform,'":") ; for [op,sig] in l repeat sayBrightly ['" ",:formatOpSignature(op,sig)] -(DEFUN |showFrom| (&REST G169993 &AUX |option| D) +(defun |showFrom| (&REST G169993 &AUX |option| D) (DSETQ (D . |option|) G169993) (PROG (|$predicateList| |ops| |domainForm| |nam| |u| |x| |alist| |conform| |l| |op| |sig|) @@ -2406,7 +2406,7 @@ ; $predicateList: local := GETDATABASE(conname,'PREDICATES) ; REMDUP listSort(function GLESSEQP,ASSOCLEFT getDomainOpTable(D,nil)) -(DEFUN |getDomainOps| (D) +(defun |getDomainOps| (D) (PROG (|$predicateList| |domname| |conname|) (DECLARE (SPECIAL |$predicateList|)) (RETURN @@ -2423,7 +2423,7 @@ ; $predicateList: local := GETDATABASE(conname,'PREDICATES) ; getDomainSigs1(D,first option) -(DEFUN |getDomainSigs| (&REST G170012 &AUX |option| D) +(defun |getDomainSigs| (&REST G170012 &AUX |option| D) (DSETQ (D . |option|) G170012) (PROG (|$predicateList| |domname| |conname|) (DECLARE (SPECIAL |$predicateList|)) @@ -2437,7 +2437,7 @@ ;getDomainSigs1(D,ops) == listSort(function GLESSEQP,u) where ; u == [x for x in getDomainOpTable(D,nil) | null ops or MEMQ(CAR x,ops)] -(DEFUN |getDomainSigs1| (D |ops|) +(defun |getDomainSigs1| (D |ops|) (PROG () (RETURN (SEQ (|listSort| #'GLESSEQP @@ -2463,7 +2463,7 @@ ; ops := KAR option ; [[op,sig,:getInheritanceByDoc(D,op,sig)] for [op,sig] in getDomainSigs1(D,ops)] -(DEFUN |getDomainDocs| (&REST G170070 &AUX |option| D) +(defun |getDomainDocs| (&REST G170070 &AUX |option| D) (DSETQ (D . |option|) G170070) (PROG (|$predicateList| |domname| |conname| |ops| |op| |sig|) (DECLARE (SPECIAL |$predicateList|)) @@ -2502,7 +2502,7 @@ ;--======================================================================= ;from?(D,op,sig) == KAR KDR getInheritanceByDoc(D,op,sig) -(DEFUN |from?| (D |op| |sig|) +(defun |from?| (D |op| |sig|) (KAR (KDR (|getInheritanceByDoc| D |op| |sig|)))) ;getExtensionsOfDomain domain == @@ -2512,7 +2512,7 @@ ; cats := UNION(cats,getCategoriesOfDomain EVAL x) ; [:u,:cats] -(DEFUN |getExtensionsOfDomain| (|domain|) +(defun |getExtensionsOfDomain| (|domain|) (PROG (|u| |cats|) (RETURN (SEQ (PROGN @@ -2536,7 +2536,7 @@ ; d := EVAL u ; acc -(DEFUN |getDomainExtensionsOfDomain| (|domain|) +(defun |getDomainExtensionsOfDomain| (|domain|) (PROG (|u| |acc| |d|) (RETURN (SEQ (PROGN @@ -2558,7 +2558,7 @@ ; u is [op,:argl] => [op,:[devaluateSlotDomain(x,dollar) for x in argl]] ; devaluate evalSlotDomain(u,dollar) -(DEFUN |devaluateSlotDomain| (|u| |dollar|) +(defun |devaluateSlotDomain| (|u| |dollar|) (PROG (|ISTMP#1| |y| |op| |argl|) (RETURN (SEQ (COND @@ -2610,7 +2610,7 @@ ; VECP x => devaluate x ; devaluateSlotDomain(x,domain) -(DEFUN |getCategoriesOfDomain| (|domain|) +(defun |getCategoriesOfDomain| (|domain|) (PROG (|predkeyVec| |catforms| |x| |ISTMP#1|) (RETURN (SEQ (PROGN @@ -2650,7 +2650,7 @@ ; or/[fn for x in catList] or '(NIL NIL) ; where fn == getDocDomainForOpSig(op,sig,substDomainArgs(D,x),D) -(DEFUN |getInheritanceByDoc| +(defun |getInheritanceByDoc| (&REST G170197 &AUX |options| |sig| |op| D) (DSETQ (D |op| |sig| . |options|) G170197) (PROG (|catList|) @@ -2679,7 +2679,7 @@ ; (u := LASSOC(op,GETDATABASE(CAR dollar,'DOCUMENTATION))) ; and (doc := or/[[d,dollar] for [s,:d] in u | compareSig(sig,s,D,dollar)]) -(DEFUN |getDocDomainForOpSig| (|op| |sig| |dollar| D) +(defun |getDocDomainForOpSig| (|op| |sig| |dollar| D) (PROG (|u| |s| |d| |doc|) (RETURN (SEQ (AND (SPADLET |u| @@ -2723,7 +2723,7 @@ ; u := rest u ; u -(DEFUN |showDomainsOp1| (|u| |key|) +(defun |showDomainsOp1| (|u| |key|) (PROG (|ISTMP#1| |op| |ISTMP#2| |sig|) (RETURN (SEQ (PROGN @@ -2758,7 +2758,7 @@ ; slot is ['SETELT,:.] => getDomainRefName(dom,getDomainSeteltForm slot) ; slot -(DEFUN |getDomainRefName| (|dom| |nam|) +(defun |getDomainRefName| (|dom| |nam|) (PROG (|slot|) (RETURN (SEQ (COND @@ -2788,7 +2788,7 @@ ; VECP form => systemError() ; form -(DEFUN |getDomainSeteltForm| (G170299) +(defun |getDomainSeteltForm| (G170299) (PROG (|form| |ISTMP#1| |u| |ISTMP#2| |d|) (RETURN (PROGN @@ -2821,7 +2821,7 @@ ; '"false: " ; sayBrightly [prefix,:pred2English p] -(DEFUN |showPredicates| (|dom|) +(defun |showPredicates| (|dom|) (PROG (|conname| |predvector| |predicateList| |prefix|) (RETURN (SEQ (PROGN @@ -2859,7 +2859,7 @@ ; '"false: " ; sayBrightly concat(prefix,form2String a) -(DEFUN |showAttributes| (|dom|) +(defun |showAttributes| (|dom|) (PROG (|conname| |abb| |predvector| |a| |p| |prefix|) (RETURN (SEQ (PROGN @@ -2901,7 +2901,7 @@ ; concat(bright "from",form2String formatLazyDomainForm(dom,whereNumber)) ; sayBrightly [i,'": ",:formatOpSignature(op,signumList),:namePart] -(DEFUN |showGoGet| (|dom|) +(defun |showGoGet| (|dom|) (PROG (|numvec| |slot| |ISTMP#1| |ISTMP#2| |dol| |ISTMP#3| |op| |numOfArgs| |whereNumber| |signumList| |index| |namePart|) (RETURN @@ -2938,7 +2938,7 @@ (SPADLET |whereNumber| (ELT |numvec| (SPADLET |index| - (PLUS |index| 1)))) + (+ |index| 1)))) (SPADLET |signumList| (PROG (G170424) (SPADLET G170424 NIL) @@ -2954,11 +2954,11 @@ (|formatLazyDomainForm| |dom| (ELT |numvec| - (PLUS |index| |i|))) + (+ |index| |i|))) G170424)))))))) (SPADLET |index| - (PLUS - (PLUS |index| |numOfArgs|) 1)) + (+ + (+ |index| |numOfArgs|) 1)) (SPADLET |namePart| (|concat| (|bright| '|from|) (|form2String| @@ -2977,7 +2977,7 @@ ; x is [dollar,slotNumber,:form] => formatLazyDomainForm(dom,form) ; systemError nil -(DEFUN |formatLazyDomain| (|dom| |x|) +(defun |formatLazyDomain| (|dom| |x|) (PROG (|dollar| |ISTMP#1| |slotNumber| |form|) (RETURN (COND @@ -3001,7 +3001,7 @@ ; x is ['NRTEVAL,y] => (atom y => [y]; y) ; [first x,:[formatLazyDomainForm(dom,y) for y in rest x]] -(DEFUN |formatLazyDomainForm| (|dom| |x|) +(defun |formatLazyDomainForm| (|dom| |x|) (PROG (|ISTMP#1| |y|) (RETURN (SEQ (COND @@ -3040,7 +3040,7 @@ ;-- has form [sig,pred,origin,exposeFlag,comments] ;dbFromConstructor?(htPage) == htpProperty(htPage,'conform) -(DEFUN |dbFromConstructor?| (|htPage|) +(defun |dbFromConstructor?| (|htPage|) (|htpProperty| |htPage| '|conform|)) ;dbDoesOneOpHaveParameters? opAlist == @@ -3048,7 +3048,7 @@ ; STRINGP x => dbPart(x,2,1) ^= '"0" ; KAR x -(DEFUN |dbDoesOneOpHaveParameters?| (|opAlist|) +(defun |dbDoesOneOpHaveParameters?| (|opAlist|) (PROG (|op| |items|) (RETURN (SEQ (PROG (G170511) @@ -3136,7 +3136,7 @@ ; key := htpProperty(htPage,'exclusion) ; dbShowOp1(htPage,opAlist,which,key) -(DEFUN |dbShowOps| +(defun |dbShowOps| (&REST G170586 &AUX |options| |key| |which| |htPage|) (DSETQ (|htPage| |which| |key| . |options|) G170586) (PROG (|arg| |filter| |opAlist|) @@ -3235,7 +3235,7 @@ ; and LOGBITP(bitNumber,code)] ; res -(DEFUN |reduceByGroup| (|htPage| |opAlist|) +(defun |reduceByGroup| (|htPage| |opAlist|) (PROG (|bitNumber| |op| |items| |code| |res|) (declare (special |$topicHash| |$groupChoice|)) (RETURN @@ -3417,7 +3417,7 @@ ; dbPresentOps(page,which,branch) ; htShowPageNoScroll() -(DEFUN |dbShowOp1| (|htPage| |opAlist| |which| |key|) +(defun |dbShowOp1| (|htPage| |opAlist| |which| |key|) (PROG (|$which| |$conformsAreDomains| |ISTMP#1| |con| |op| |items| |acc| |opCount| |branch| |LETTMP#1| |what| |whats| |fn| |data| |ops| |namedPart| |dataCount| |exposurePart| @@ -3584,7 +3584,7 @@ (ATOM |x|)) ('T 'T)) (SETQ G170742 - (PLUS G170742 1)))))))))) + (+ G170742 1)))))))))) (SPADLET |namedPart| (COND ((NULL (CDR |opAlist|)) @@ -3664,7 +3664,7 @@ ; --count if unexpanded---CDDR(w) = nil---or if w.3 = true ; +/[1 for w in items | null (p := CDDR w) or p . 1] -(DEFUN |opAlistCount| (|opAlist| |which|) +(defun |opAlistCount| (|opAlist| |which|) (PROG (|op| |items| |p|) (declare (special |$exposedOnlyIfTrue|)) (RETURN @@ -3683,7 +3683,7 @@ NIL)) G170801) (SEQ (EXIT (SETQ G170801 - (PLUS G170801 + (+ G170801 (COND ((OR (NULL |$exposedOnlyIfTrue|) @@ -3713,7 +3713,7 @@ (CDDR |w|))) (ELT |p| 1)) (SETQ G170814 - (PLUS G170814 + (+ G170814 1)))))))))))))))))))))) ;dbShowOpHeading(heading, branch) == @@ -3725,7 +3725,7 @@ ; '"" ; [:heading, suffix] -(DEFUN |dbShowOpHeading| (|heading| |branch|) +(defun |dbShowOpHeading| (|heading| |branch|) (PROG (|suffix|) (RETURN (PROGN @@ -3743,7 +3743,7 @@ ;dbOpsExposureMessage() == ; $atLeastOneUnexposed => htSay '"{\em *} = unexposed" -(DEFUN |dbOpsExposureMessage| () +(defun |dbOpsExposureMessage| () (declare (special |$atLeastOneUnexposed|)) (SEQ (COND (|$atLeastOneUnexposed| @@ -3770,7 +3770,7 @@ ; KDR domname => ['" {\em from} ",:dbConformGen domname] ; htpProperty(htPage,'fromHeading) -(DEFUN |fromHeading| (|htPage|) +(defun |fromHeading| (|htPage|) (PROG (|updomain| |dnForm| |dnString| |dnFence| |upFence| |upOp| |domname| |numberOfUnderlyingDomains|) (declare (special |$pn|)) @@ -3832,7 +3832,7 @@ ;pickitForm(form,uarg) == ; conform2StringList(form,FUNCTION dbConform,FUNCTION conformString,uarg) -(DEFUN |pickitForm| (|form| |uarg|) +(defun |pickitForm| (|form| |uarg|) (|conform2StringList| |form| #'|dbConform| #'|conformString| |uarg|)) ;conformString(form) == @@ -3841,7 +3841,7 @@ ; FUNCTION conformString,nil) ; form2StringList form -(DEFUN |conformString| (|form|) +(defun |conformString| (|form|) (COND ((KDR |form|) (|conform2StringList| |form| #'|conname2StringList| @@ -3885,7 +3885,7 @@ ; APPLY(opFn,[form]) ; [:head,'"(",:first sargl,:"append"/[[",",:y] for y in rest sargl],'")"] -(DEFUN |conform2StringList| (|form| |opFn| |argFn| |exception|) +(defun |conform2StringList| (|form| |opFn| |argFn| |exception|) (PROG (|op1| |args| |op| special |cosig| |atypes| |y| |ISTMP#2| |t| |keyword| |typ| |ISTMP#1| |a| |u| |res| |sargl| |head|) @@ -4077,7 +4077,7 @@ ; first sl ; [:sourcePart,'" -> ",:target] -(DEFUN |dbMapping2StringList| (G171038) +(defun |dbMapping2StringList| (G171038) (PROG (|target| |sl| |restPart| |sourcePart|) (RETURN (SEQ (PROGN @@ -4135,7 +4135,7 @@ ; ['QUOTE,res] ; [op,:argl] -(DEFUN |dbOuttran| (|form|) +(defun |dbOuttran| (|form|) (PROG (|op| |args| |cosig| |atypes| |typ| |ISTMP#1| |a| |arg| |res| |argl|) (RETURN @@ -4218,7 +4218,7 @@ ; ["\ops{",:conform2StringList(form,FUNCTION conname2StringList,_ ; FUNCTION conformString,nil),'"}{",:$pn,:form2Fence form,'"}"] -(DEFUN |dbOpsForm| (|form|) +(defun |dbOpsForm| (|form|) (declare (special |$pn|)) (CONS '|\\ops{| (APPEND (|conform2StringList| |form| #'|conname2StringList| @@ -4230,13 +4230,13 @@ ;dbConformGen form == dbConformGen1(form,true) -(DEFUN |dbConformGen| (|form|) (|dbConformGen1| |form| 'T)) +(defun |dbConformGen| (|form|) (|dbConformGen1| |form| 'T)) ;--many buttons: one for the type and one for each inner type ;--NOTE: must only be called on types KNOWN to be correct ;dbConformGenUnder form == dbConformGen1(form,false) -(DEFUN |dbConformGenUnder| (|form|) (|dbConformGen1| |form| NIL)) +(defun |dbConformGenUnder| (|form|) (|dbConformGen1| |form| NIL)) ;--same as above, except buttons only for the inner types ;dbConformGen1(form,opButton?) == @@ -4252,7 +4252,7 @@ ; args => conform2StringList(form, opFunction,FUNCTION dbConformGen,nil) ; APPLY(opFunction,[form]) -(DEFUN |dbConformGen1| (|form| |opButton?|) +(defun |dbConformGen1| (|form| |opButton?|) (PROG (|opFunction| |originalOp| |op| |args|) (RETURN (PROGN @@ -4274,13 +4274,13 @@ ;unAbbreviateIfNecessary op == IFCAR HGET($lowerCaseConTb, op) or op -(DEFUN |unAbbreviateIfNecessary| (|op|) +(defun |unAbbreviateIfNecessary| (|op|) (declare (special |$lowerCaseConTb|)) (OR (IFCAR (HGET |$lowerCaseConTb| |op|)) |op|)) ;conname2StringList form == [PNAME unAbbreviateIfNecessary opOf form] -(DEFUN |conname2StringList| (|form|) +(defun |conname2StringList| (|form|) (CONS (PNAME (|unAbbreviateIfNecessary| (|opOf| |form|))) NIL)) ;--=========================================================================== @@ -4358,7 +4358,7 @@ ; data := listSort(function LEXLESSEQP,data) ; data -(DEFUN |dbGatherData| (|htPage| |opAlist| |which| |key|) +(defun |dbGatherData| (|htPage| |opAlist| |which| |key|) (PROG (|dataFunction| |initialExposure| |item| |isExposed?| |exposureFlag| |node| |acc| |op| |alist| |entry| |exposeFlag| |ISTMP#1| |u| |y| |newEntry| |r| |tail| @@ -4589,11 +4589,11 @@ ; atom key => true ; isExposedConstructor CAR key -(DEFUN |dbGatherDataImplementation,gn| (|key|) +(defun |dbGatherDataImplementation,gn| (|key|) (SEQ (IF (ATOM |key|) (EXIT 'T)) (EXIT (|isExposedConstructor| (CAR |key|))))) -(DEFUN |dbGatherDataImplementation,fn| (|l|) +(defun |dbGatherDataImplementation,fn| (|l|) (PROG (|key| |entries| |alist|) (RETURN (SEQ (SPADLET |alist| NIL) @@ -4634,7 +4634,7 @@ |alist|)))))))) (EXIT (NREVERSE |alist|)))))) -(DEFUN |dbGatherDataImplementation| (|htPage| |opAlist|) +(defun |dbGatherDataImplementation| (|htPage| |opAlist|) (PROG (|$predicateList| |conform| |domainForm| |dom| |which| |nam| |predVector| |u| |key| |domexports| |unexports| |defexports| |nowheres| |constants| |others|) @@ -4702,7 +4702,7 @@ ; dbReduceOpAlist(opAlist,innerData.binkey,'signatures) ; [opAlist . key] -(DEFUN |dbSelectData| (|htPage| |opAlist| |key|) +(defun |dbSelectData| (|htPage| |opAlist| |key|) (PROG (|branch| |data| |LETTMP#1| |newkey| |binkey| |innerData|) (RETURN (PROGN @@ -4732,7 +4732,7 @@ ; branch = 'parameters => dbReduceByForm(opAlist,CAR data) ; systemError ['"Unexpected branch: ",branch] -(DEFUN |dbReduceOpAlist| (|opAlist| |data| |branch|) +(defun |dbReduceOpAlist| (|opAlist| |data| |branch|) (COND ((BOOT-EQUAL |branch| '|signatures|) (|dbReduceBySignature| |opAlist| (CAAR |data|) (CADAR |data|))) @@ -4759,7 +4759,7 @@ ; entryList => acc := [[op,:NREVERSE entryList],:acc] ; NREVERSE acc -(DEFUN |dbReduceByOpSignature| (|opAlist| |datalist|) +(defun |dbReduceByOpSignature| (|opAlist| |datalist|) (PROG (|ops| |op| |alist| |sig| |ISTMP#1| |ISTMP#2| |entryList| |acc|) (RETURN @@ -4887,7 +4887,7 @@ ;--reduces opAlist to one with a fixed op and sig ; [[op,:[x for x in LASSOC(op,opAlist) | x is [=sig,:.]]]] -(DEFUN |dbReduceBySignature| (|opAlist| |op| |sig|) +(defun |dbReduceBySignature| (|opAlist| |op| |sig|) (PROG () (RETURN (SEQ (CONS (CONS |op| @@ -4916,7 +4916,7 @@ ; acc := [[op,:items],:acc] ; NREVERSE acc -(DEFUN |dbReduceByForm| (|opAlist| |form|) +(defun |dbReduceByForm| (|opAlist| |form|) (PROG (|op| |alist| |items| |acc|) (RETURN (SEQ (PROGN @@ -4971,7 +4971,7 @@ ; acc := [[op,:items],:acc] ; NREVERSE acc -(DEFUN |dbReduceBySelection| (|opAlist| |key| |fn|) +(defun |dbReduceBySelection| (|opAlist| |key| |fn|) (PROG (|op| |alist| |items| |acc|) (RETURN (SEQ (PROGN @@ -5023,7 +5023,7 @@ ; $which = '"attribute" => [op,sig] ; dbMakeContrivedForm(op,sig) -(DEFUN |dbContrivedForm| (|op| G171613) +(defun |dbContrivedForm| (|op| G171613) (PROG (|sig|) (declare (special |$which|)) (RETURN @@ -5036,7 +5036,7 @@ ;dbMakeSignature(op,[sig,:.]) == [op,sig] --getDomainOpTable format -(DEFUN |dbMakeSignature| (|op| G171624) +(defun |dbMakeSignature| (|op| G171624) (PROG (|sig|) (RETURN (PROGN @@ -5045,14 +5045,14 @@ ;dbGetOrigin(op,[.,.,origin,:.]) == origin -(DEFUN |dbGetOrigin| (|op| G171635) +(defun |dbGetOrigin| (|op| G171635) (declare (ignore |op|)) (PROG (|origin|) (RETURN (PROGN (SPADLET |origin| (CADDR G171635)) |origin|)))) ;dbGetCondition(op,[.,pred,:.]) == pred -(DEFUN |dbGetCondition| (|op| G171646) +(defun |dbGetCondition| (|op| G171646) (declare (ignore |op|)) (PROG (|pred|) (RETURN (PROGN (SPADLET |pred| (CADR G171646)) |pred|)))) @@ -5074,7 +5074,7 @@ ; exposedOnly? := $exposedOnlyIfTrue and not dbFromConstructor?(htPage) ; dbShowOpItems(which,data,exposedOnly?) -(DEFUN |dbShowOpNames| (|htPage| |opAlist| |which| |data|) +(defun |dbShowOpNames| (|htPage| |opAlist| |which| |data|) (PROG (|single?| |ops| |exposedOnly?|) (declare (special |$exposedOnlyIfTrue|)) (RETURN @@ -5113,7 +5113,7 @@ ; htSay('"}") ; htEndTable() -(DEFUN |dbShowOpItems| (|which| |data| |exposedOnly?|) +(defun |dbShowOpItems| (|which| |data| |exposedOnly?|) (PROG (|firstTime| |op| |exposeFlag| |ops|) (RETURN (SEQ (PROGN @@ -5185,7 +5185,7 @@ ; htpSetProperty(htPage,'specialHeading,'"hoho") ; dbShowCons(htPage,'names) -(DEFUN |dbShowOpAllDomains| (|htPage| |opAlist| |which|) +(defun |dbShowOpAllDomains| (|htPage| |opAlist| |which|) (PROG (|op| |items| |predicate| |origin| |conname| |catOriginAlist| |domOriginAlist| |cat| |dom| |pred| |u| |cAlist|) (declare (special *hascategory-hash*)) @@ -5319,7 +5319,7 @@ ; atom new => old ; 'etc -(DEFUN |simpOrDumb| (|new| |old|) +(defun |simpOrDumb| (|new| |old|) (COND ((BOOT-EQUAL |new| '|etc|) '|etc|) ((ATOM |new|) |old|) @@ -5329,21 +5329,21 @@ ; dbGatherThenShow(htPage,opAlist,which,data,true,_ ; '"from",function bcStarConform) -(DEFUN |dbShowOpOrigins| (|htPage| |opAlist| |which| |data|) +(defun |dbShowOpOrigins| (|htPage| |opAlist| |which| |data|) (|dbGatherThenShow| |htPage| |opAlist| |which| |data| 'T "from" #'|bcStarConform|)) ;dbShowOpImplementations(htPage,opAlist,which,data) == ; dbGatherThenShow(htPage,opAlist,which,data,true,'"by",function bcStarConform) -(DEFUN |dbShowOpImplementations| (|htPage| |opAlist| |which| |data|) +(defun |dbShowOpImplementations| (|htPage| |opAlist| |which| |data|) (|dbGatherThenShow| |htPage| |opAlist| |which| |data| 'T "by" #'|bcStarConform|)) ;dbShowOpConditions(htPage,opAlist,which,data) == ; dbGatherThenShow(htPage,opAlist,which,data,nil,nil,function bcPred) -(DEFUN |dbShowOpConditions| (|htPage| |opAlist| |which| |data|) +(defun |dbShowOpConditions| (|htPage| |opAlist| |which| |data|) (|dbGatherThenShow| |htPage| |opAlist| |which| |data| NIL NIL #'|bcPred|)) @@ -5355,7 +5355,7 @@ ; '"domain" ; PNAME kind -(DEFUN |dbShowKind| (|conform|) +(defun |dbShowKind| (|conform|) (PROG (|conname| |kind| |s|) (RETURN (PROGN @@ -5373,7 +5373,7 @@ ;dbShowOpSignatures(htPage,opAlist,which,data) == dbShowOpSigList(which,data,0) -(DEFUN |dbShowOpSignatures| (|htPage| |opAlist| |which| |data|) +(defun |dbShowOpSignatures| (|htPage| |opAlist| |which| |data|) (declare (ignore |htPage| |opAlist|)) (|dbShowOpSigList| |which| |data| 0)) @@ -5399,7 +5399,7 @@ ; htEndTable() ; count -(DEFUN |dbShowOpSigList| (|which| |dataItems| |count|) +(defun |dbShowOpSigList| (|which| |dataItems| |count|) (PROG (|single?| |op| |sig| |exposureFlag| |tail| |firstTime| |ops|) (RETURN (SEQ (PROGN @@ -5450,7 +5450,7 @@ ('T (|bcConform| (CONS '|Mapping| |sig|)))))) (|htSay| "}") - (SPADLET |count| (PLUS |count| 1)))))) + (SPADLET |count| (+ |count| 1)))))) (|htEndTable|) |count|))))) @@ -5500,7 +5500,7 @@ nil (cons (cons (first x) (second x)) (plist2alist (cddr x))))) -(DEFUN |dbShowOpParameters| (|htPage| |opAlist| |which| |data|) +(defun |dbShowOpParameters| (|htPage| |opAlist| |which| |data|) (declare (ignore |htPage| |opAlist|)) (PROG (|single?| |firstTime| |opform| |exposeFlag| |tail| |op| |args| |ops| |n| |count|) @@ -5580,14 +5580,14 @@ "}")))) (|htSay| ")")))))) (|htSay| "}") - (SPADLET |count| (PLUS |count| 1)))))) + (SPADLET |count| (+ |count| 1)))))) (|htEndTable|)))))) ;dbShowOpParameterJump(ops,which,count,single?) == ; single? => htSay('"{\em ",ops,'"}") ; htMakePage [['bcLinks,[ops,'"",'dbShowOps,which,count]]] -(DEFUN |dbShowOpParameterJump| (|ops| |which| |count| |single?|) +(defun |dbShowOpParameterJump| (|ops| |which| |count| |single?|) (COND (|single?| (|htSay| "{\\em " |ops| "}")) ('T @@ -5642,7 +5642,7 @@ ; index,'dbChooseDomainOp,null exposeFlag,true) ; htSaySaturn '"\end{description}" -(DEFUN |dbShowOpDocumentation| (|htPage| |opAlist| |which| |data|) +(defun |dbShowOpDocumentation| (|htPage| |opAlist| |which| |data|) (declare (ignore |data|)) (PROG (|conform| |newWhich| |expand| |condata| |ISTMP#1| |ISTMP#2| |exactlyOneOpSig| |op| |alist| |base| |predicate| @@ -5706,7 +5706,7 @@ NIL)) NIL) (SEQ (EXIT (PROGN - (SPADLET |base| (PLUS 8192 |base|)) + (SPADLET |base| (+ 8192 |base|)) (DO ((G172011 |alist| (CDR G172011)) (|item| NIL) (|j| 0 (QSADD1 |j|))) ((OR (ATOM G172011) @@ -5760,7 +5760,7 @@ (SPADLET |index| (COND (|exactlyOneOpSig| NIL) - ('T (PLUS |base| |j|)))) + ('T (+ |base| |j|)))) (COND ((BOOT-EQUAL |which| "package operation") @@ -5792,7 +5792,7 @@ ; dbResetOpAlistCondition(htPage,which,opAlist) ; dbShowOps(htPage,which,'documentation) -(DEFUN |dbChooseDomainOp| (|htPage| |which| |index|) +(defun |dbChooseDomainOp| (|htPage| |which| |index|) (PROG (|opKey| |entryKey| |opAlist| |LETTMP#1| |op| |entries| |entry|) (RETURN @@ -5831,7 +5831,7 @@ ; htSayUnexposed() ; htSay '"" -(DEFUN |htSayExpose| (|op| |flag|) +(defun |htSayExpose| (|op| |flag|) (declare (special |$includeUnexposed?|)) (COND (|$includeUnexposed?| @@ -5884,7 +5884,7 @@ ; else dbResetOpAlistCondition(htPage,which,opAlist) ; dbShowOp1(htPage,reducedOpAlist,which,'names) -(DEFUN |dbShowOperationsFromConform| (|htPage| |which| |opAlist|) +(defun |dbShowOperationsFromConform| (|htPage| |which| |opAlist|) (PROG (|$conformsAreDomains| |x| |c| |domform| |conform| |kind| |exposePart| |fromPart| |heading| |expandProperty| |reducedOpAlist|) @@ -5975,7 +5975,7 @@ ; item ; opAlist -(DEFUN |reduceOpAlistForDomain| (|opAlist| |domform| |conform|) +(defun |reduceOpAlistForDomain| (|opAlist| |domform| |conform|) (PROG (|form1| |form2| |head| |tail| |pred|) (RETURN (SEQ (PROGN @@ -6080,7 +6080,7 @@ ; first item = $attributeArgs]]] ; dbShowOp1(htPage,opAlist,which,'names) -(DEFUN |dbShowOperationLines| (|which| |linelist|) +(defun |dbShowOperationLines| (|which| |linelist|) (PROG (|htPage| |name| |lines| |x| |pile| |expandProperty| |opAlist|) (declare (special |$includeUnexposed?| |$attributeArgs|)) (RETURN @@ -6161,7 +6161,7 @@ ; htpSetProperty(htPage,'condition?,(value => 'yes; 'no)) ; value -(DEFUN |dbResetOpAlistCondition| (|htPage| |which| |opAlist|) +(defun |dbResetOpAlistCondition| (|htPage| |which| |opAlist|) (PROG (|value|) (RETURN (PROGN @@ -6181,7 +6181,7 @@ ; htpSetProperty(htPage,'condition?,(value => 'yes; 'no)) ; value -(DEFUN |dbSetOpAlistCondition| (|htPage| |opAlist| |which|) +(defun |dbSetOpAlistCondition| (|htPage| |opAlist| |which|) (PROG (|condition| |value|) (RETURN (PROGN @@ -6281,7 +6281,7 @@ ; htpSetProperty(htPage,expandProperty,'fullyExpanded) ; 'done -(DEFUN |dbExpandOpAlistIfNecessary| +(defun |dbExpandOpAlistIfNecessary| (|htPage| |opAlist| |which| |needOrigins?| |condition?|) (declare (special |needOrigins?|)) (PROG (|$value| |expandProperty| |expandFlag| |lines| |LETTMP#1| @@ -6526,7 +6526,7 @@ ; match := or/[y for y in v | y is [['attribute,: =sig],:.]] => CADR match ; '"" -(DEFUN |getRegistry| (|op| |sig|) +(defun |getRegistry| (|op| |sig|) (PROG (|u| |v| |ISTMP#1| |match|) (RETURN (SEQ (PROGN @@ -6583,7 +6583,7 @@ ; typ := sublisFormal(arglist,ftype) ; mathform2HtString algCoerceInteractive(arg,typ,'(OutputForm)) -(DEFUN |evalableConstructor2HtString,unquote| (|arg|) +(defun |evalableConstructor2HtString,unquote| (|arg|) (PROG (|f| |args|) (RETURN (SEQ (IF (AND (CONSP |arg|) @@ -6616,7 +6616,7 @@ G172440)))))))))))) (EXIT |arg|))))) -(DEFUN |evalableConstructor2HtString| (|domform|) +(defun |evalableConstructor2HtString| (|domform|) (PROG (|conname| |coSig| |arglist| |fargtypes| |typ|) (RETURN (SEQ (PROGN @@ -6718,7 +6718,7 @@ ; atom form => form ; "STRCONC"/fortexp0 form -(DEFUN |mathform2HtString| (|form|) +(defun |mathform2HtString| (|form|) (PROG (|$fortInts2Floats| |r| |a| |y| |ISTMP#1| |ISTMP#2| |ISTMP#3| |ISTMP#4| |arg| |tailPart|) (DECLARE (SPECIAL |$fortInts2Floats|)) @@ -6893,7 +6893,7 @@ ; form is [x] and GET(x,'NILADIC) => x ; [niladicHack x for x in form] -(DEFUN |niladicHack| (|form|) +(defun |niladicHack| (|form|) (PROG (|x|) (RETURN (SEQ (COND @@ -6952,12 +6952,12 @@ ; 'nowhere ; [sig1,:info] -(DEFUN |getDomainOpTable,memq| (|op| |ops|) +(defun |getDomainOpTable,memq| (|op| |ops|) (SEQ (IF (member |op| |ops|) (EXIT |op|)) (IF (EQ |op| '|One|) (EXIT (AND (member 1 |ops|) 1))) (IF (EQ |op| '|Zero|) (EXIT (AND (member 0 |ops|) 0))) (EXIT NIL))) -(DEFUN |getDomainOpTable| +(defun |getDomainOpTable| (&REST G172808 &AUX |options| |fromIfTrue| |dom|) (DSETQ (|dom| |fromIfTrue| . |options|) G172808) (PROG (|$predEvalAlist| |$returnNowhereFromGoGet| |ops| |domname| @@ -7135,7 +7135,7 @@ ; pred = 'T => true ; systemError '"unknown atomic predicate form" -(DEFUN |evalDomainOpPred,evpred1| (|dom| |pred|) +(defun |evalDomainOpPred,evpred1| (|dom| |pred|) (PROG (|op| |argl| |k| |arg| |a| |attPredIndex|) (declare (special |$predicateList|)) (RETURN @@ -7194,7 +7194,7 @@ (IF (SPADLET |k| (POSN1 |pred| |$predicateList|)) (EXIT (|testBitVector| (ELT |dom| 3) - (PLUS |k| 1)))) + (+ |k| 1)))) (IF (BOOT-EQUAL |op| '|HasAttribute|) (EXIT (SEQ (PROGN @@ -7215,15 +7215,15 @@ (EXIT (|systemError| "unknown atomic predicate form")))))) -(DEFUN |evalDomainOpPred,evpred| (|dom| |pred|) +(defun |evalDomainOpPred,evpred| (|dom| |pred|) (PROG (|k|) (declare (special |$predicateList|)) (RETURN (SEQ (IF (SPADLET |k| (POSN1 |pred| |$predicateList|)) - (EXIT (|testBitVector| (ELT |dom| 3) (PLUS |k| 1)))) + (EXIT (|testBitVector| (ELT |dom| 3) (+ |k| 1)))) (EXIT (|evalDomainOpPred,evpred1| |dom| |pred|)))))) -(DEFUN |evalDomainOpPred,convertCatArg| (|p|) +(defun |evalDomainOpPred,convertCatArg| (|p|) (PROG () (RETURN (SEQ (IF (OR (ATOM |p|) (EQL (|#| |p|) 1)) (EXIT (MKQ |p|))) @@ -7248,7 +7248,7 @@ |x|) G172881)))))))))))))) -(DEFUN |evalDomainOpPred,convert| (|dom| |pred|) +(defun |evalDomainOpPred,convert| (|dom| |pred|) (PROG (|op| |argl| |arg| |p| |ISTMP#1| |a|) (RETURN (SEQ (IF (AND (CONSP |pred|) @@ -7339,14 +7339,14 @@ (IF (BOOT-EQUAL |pred| 'T) (EXIT 'T)) (EXIT (|systemError| NIL)))))) -(DEFUN |evalDomainOpPred,process| (|dom| |pred|) +(defun |evalDomainOpPred,process| (|dom| |pred|) (PROG (|u|) (RETURN (SEQ (SPADLET |u| (|evalDomainOpPred,convert| |dom| |pred|)) (IF (BOOT-EQUAL |u| 'T) (EXIT 'T)) (EXIT (|evalDomainOpPred,evpred| |dom| |u|)))))) -(DEFUN |evalDomainOpPred| (|dom| |pred|) +(defun |evalDomainOpPred| (|dom| |pred|) (|evalDomainOpPred,process| |dom| |pred|)) ;--====================> WAS br-op2.boot <================================ @@ -7387,7 +7387,7 @@ ; htSay(kind,'" ") ; bcConform(u,true) -(DEFUN |htSayConstructor| (|key| |u|) +(defun |htSayConstructor| (|key| |u|) (PROG (|kind| |ISTMP#2| |middle| |ISTMP#1| |r|) (RETURN (SEQ (COND @@ -7490,7 +7490,7 @@ ; htSay('"{\em if ...}") ; systemError() -(DEFUN |htSayExplicitExports| (|r|) +(defun |htSayExplicitExports| (|r|) (PROG (|op| |ISTMP#2| |sig| |ops| |ISTMP#1| |a| |s|) (declare (special |$displayReturnValue|)) (RETURN @@ -7566,7 +7566,7 @@ ; pred is [op,:u] and MEMBER(op,'(and AND)) => u ; [pred] -(DEFUN |displayBreakIntoAnds| (|pred|) +(defun |displayBreakIntoAnds| (|pred|) (PROG (|op| |u|) (RETURN (COND @@ -7591,7 +7591,7 @@ ; htSay('"an element of domain ") ; htSayArgument t --continue for operations -(DEFUN |htSayValue| (|t|) +(defun |htSayValue| (|t|) (PROG (|ISTMP#1| |target| |source| |op|) (RETURN (COND @@ -7632,7 +7632,7 @@ ; addWhereList(t,'member,typeOfArg) ; htSay('"{\em ",t,'"}") -(DEFUN |htSayArgument| (|t|) +(defun |htSayArgument| (|t|) (PROG (|k| |typeOfArg|) (declare (special |$signature| |$conkind| |$conlength| |$generalSearch?| |$conargs|)) @@ -7664,7 +7664,7 @@ ;addWhereList(id,kind,typ) == ; $whereList := insert([id,kind,:typ],$whereList) -(DEFUN |addWhereList| (|id| |kind| |typ|) +(defun |addWhereList| (|id| |kind| |typ|) (SPADLET |$whereList| (|insert| (CONS |id| (CONS |kind| |typ|)) |$whereList|))) @@ -7678,7 +7678,7 @@ ; htSayArgument d ; htSay '")" -(DEFUN |htSayTuple| (|t|) +(defun |htSayTuple| (|t|) (SEQ (COND ((NULL |t|) (|htSay| "()")) ((NULL (CDR |t|)) (|htSayArgument| (CAR |t|))) @@ -7695,7 +7695,7 @@ ;dbGetDisplayFormForOp(op,sig,doc) == ; dbGetFormFromDocumentation(op,sig,doc) or dbGetContrivedForm(op,sig) -(DEFUN |dbGetDisplayFormForOp| (|op| |sig| |doc|) +(defun |dbGetDisplayFormForOp| (|op| |sig| |doc|) (OR (|dbGetFormFromDocumentation| |op| |sig| |doc|) (|dbGetContrivedForm| |op| |sig|))) @@ -7710,7 +7710,7 @@ ; parse is [=op,:.] and #parse = #sig => parse ; nil -(DEFUN |dbGetFormFromDocumentation| (|op| |sig| |x|) +(defun |dbGetFormFromDocumentation| (|op| |sig| |x|) (PROG (|doc| |k| |n| |s| |parse|) (declare (special |$charRbrace|)) (RETURN @@ -7741,7 +7741,7 @@ ; $DomainList: local := '(R S D E T A B C M N P Q U V W) ; dbGetContrivedForm(op,sig) -(DEFUN |dbMakeContrivedForm| +(defun |dbMakeContrivedForm| (&REST G173155 &AUX |options| |sig| |op|) (DSETQ (|op| |sig| . |options|) G173155) (PROG (|$chooseDownCaseOfType| |$NumberList| |$ElementList| @@ -7770,7 +7770,7 @@ ; op = '"1" => [1] ; [op,:[dbChooseOperandName s for s in rest sig]] -(DEFUN |dbGetContrivedForm| (|op| |sig|) +(defun |dbGetContrivedForm| (|op| |sig|) (PROG () (RETURN (SEQ (COND @@ -7820,7 +7820,7 @@ ; $DomainList := rest $DomainList ; x -(DEFUN |dbChooseOperandName| (|typ|) +(defun |dbChooseOperandName| (|typ|) (PROG (|name| |kind| |s| |y| |x|) (declare (special |$FunctionList| |$NumberList| |$chooseDownCaseOfType| |$ElementList| |$DomainList|)) @@ -7861,7 +7861,7 @@ ;getSubstSigIfPossible sig == ; getSubstSignature sig or sig -(DEFUN |getSubstSigIfPossible| (|sig|) +(defun |getSubstSigIfPossible| (|sig|) (OR (|getSubstSignature| |sig|) |sig|)) ;-- @@ -7873,7 +7873,7 @@ ; atom z => z ; [fullSubstitute(x,y,u) for u in z] -(DEFUN |fullSubstitute| (|x| |y| |z|) +(defun |fullSubstitute| (|x| |y| |z|) (PROG () (RETURN (SEQ (COND @@ -7900,7 +7900,7 @@ ; candidates := insert(y,candidates) ; candidates -(DEFUN |getSubstCandidates| (|sig|) +(defun |getSubstCandidates| (|sig|) (PROG (|ISTMP#1| |.| |y| |candidates|) (RETURN (SEQ (PROGN @@ -7985,7 +7985,7 @@ ; addWhereList(D,'is,winner) ; newsig -(DEFUN |getSubstSignature| (|sig|) +(defun |getSubstSignature| (|sig|) (PROG (|candidates| D |trial| |trialCount| |newsig| |count| |winner|) (declare (special |$DomainList|)) (RETURN @@ -8029,7 +8029,7 @@ ; or/[CONTAINED(x,y) for y in sig for j in 1.. | j ^= i] => x ; false -(DEFUN |getSubstQualify| (|x| |i| |sig|) +(defun |getSubstQualify| (|x| |i| |sig|) (PROG () (RETURN (SEQ (COND @@ -8057,7 +8057,7 @@ ; y := or/[CONTAINED(y,x) for y in candidates] => SUBST(x,y,candidates) ; candidates -(DEFUN |getSubstInsert| (|x| |candidates|) +(defun |getSubstInsert| (|x| |candidates|) (PROG (|y|) (RETURN (SEQ (PROGN @@ -8146,7 +8146,7 @@ ; dbPresentOps(page,which,'usage) ; htShowPageNoScroll() -(DEFUN |whoUsesOperation| (|htPage| |which| |key|) +(defun |whoUsesOperation| (|htPage| |which| |key|) (PROG (|opAlist| |conform| |conargs| |alist| |opl| |u| |prefix| |ISTMP#1| |op1| |ISTMP#2| |suffix| |page| |name| |opsigList| |sofar| |nopAlist| |pair| |namelist| |ops| @@ -8343,7 +8343,7 @@ ; if opacc then acc := [[name,:opacc],:acc] ; acc -(DEFUN |whoUses| (|opSigList| |conform|) +(defun |whoUses| (|opSigList| |conform|) (PROG (|$conname| |$infovec| |opList| |numOfArgsList| |domList| |hash| |template| |found| |item| |n| |op| |numvec| |numOfArgs| |index| |whereNumber| |ISTMP#1| |signumList| @@ -8375,7 +8375,7 @@ (EXIT (SETQ G173535 (CONS - (PLUS (SPADDIFFERENCE 1) + (+ (SPADDIFFERENCE 1) (|#| |sig|)) G173535))))))))) (SPADLET |acc| NIL) @@ -8434,7 +8434,7 @@ (SPADLET |whereNumber| (ELT |numvec| (SPADLET |index| - (PLUS |index| 1)))) + (+ |index| 1)))) (COND ((NULL (PROGN @@ -8450,7 +8450,7 @@ ('T (SPADLET |signumList| (|dcSig| |numvec| - (PLUS |index| 1) + (+ |index| 1) |numOfArgs|)) (COND ((SPADLET |opsig| @@ -8520,7 +8520,7 @@ ;whoUsesMatch?(signumList,sig,al) == ; #signumList = #sig and whoUsesMatch1?(signumList,sig,al) -(DEFUN |whoUsesMatch?| (|signumList| |sig| |al|) +(defun |whoUsesMatch?| (|signumList| |sig| |al|) (AND (BOOT-EQUAL (|#| |signumList|) (|#| |sig|)) (|whoUsesMatch1?| |signumList| |sig| |al|))) @@ -8535,7 +8535,7 @@ ; whoUsesMatch1?(r,s,[[pattern,:subject],:al]) ; true -(DEFUN |whoUsesMatch1?| (|signumList| |sig| |al|) +(defun |whoUsesMatch1?| (|signumList| |sig| |al|) (PROG (|subject| |r| |pattern| |s| |x|) (declare (special |$conname|)) (RETURN @@ -8590,7 +8590,7 @@ ; alist := insertAlist(op,insertAlist(args,[pred],LASSOC(op,alist)),alist) ; alist -(DEFUN |koAttrs,fn| (|u|) +(defun |koAttrs,fn| (|u|) (PROG (|a| |pred| |op| |args| |alist|) (declare (special |$domain|)) (RETURN @@ -8615,7 +8615,7 @@ |alist|))))) (EXIT |alist|))))) -(DEFUN |koAttrs| (|conform| |domname|) +(defun |koAttrs| (|conform| |domname|) (PROG (|$infovec| |$predvec| |conname| |args| |a| |i| |pred| |u|) (DECLARE (SPECIAL |$infovec| |$predvec| |$domain|)) (RETURN @@ -8716,7 +8716,7 @@ ; alist := insertAlist(op,al,alist) --add the whole inner alist ; alist -(DEFUN |koOps,merge| (|alist| |alist1|) +(defun |koOps,merge| (|alist| |alist1|) (PROG (|op| |al| |sig| |item| |u|) (RETURN (SEQ (DO ((G173767 |alist1| (CDR G173767)) (G173755 NIL)) @@ -8760,7 +8760,7 @@ (|insertAlist| |op| |al| |alist|))))) (EXIT |alist|))))) -(DEFUN |koOps,fn| (|conform| |domname|) +(defun |koOps,fn| (|conform| |domname|) (PROG (|$infovec| |conname| |args| |subargs| |exposureTail| |op| |u| |op1| |sig| |slot| |pred| |key| |npred| |acc|) (DECLARE (SPECIAL |$infovec| |$packageItem|)) @@ -8840,7 +8840,7 @@ |acc|))))) (EXIT |acc|))))) -(DEFUN |koOps,trim| (|u|) +(defun |koOps,trim| (|u|) (PROG () (RETURN (SEQ (PROG (G173860) @@ -8855,7 +8855,7 @@ (SETQ G173860 (CONS |pair| G173860))))))))))))) -(DEFUN |koOps| (&REST G173884 &AUX |options| |domname| |conform|) +(defun |koOps| (&REST G173884 &AUX |options| |domname| |conform|) (DSETQ (|conform| |domname| . |options|) G173884) (PROG (|$packageItem| |ours|) (DECLARE (SPECIAL |$packageItem|)) @@ -8870,7 +8870,7 @@ ; x = 'One => 1 ; x -(DEFUN |zeroOneConvert| (|x|) +(defun |zeroOneConvert| (|x|) (COND ((BOOT-EQUAL |x| '|Zero|) 0) ((BOOT-EQUAL |x| '|One|) 1) @@ -8887,7 +8887,7 @@ ; op = 'QUOTE and atom CADR x => CADR x ; x -(DEFUN |kFormatSlotDomain,fn| (|x|) +(defun |kFormatSlotDomain,fn| (|x|) (PROG (|op|) (declare (special |$Primitives|)) (RETURN @@ -8920,7 +8920,7 @@ (EXIT (CADR |x|))) (EXIT |x|))))) -(DEFUN |kFormatSlotDomain| (|x|) +(defun |kFormatSlotDomain| (|x|) (|kFormatSlotDomain,fn| (|formatSlotDomain| |x|))) ;koCatOps(conform,domname) == @@ -8931,7 +8931,7 @@ ; [[zeroOneConvert op,:nalist] for [op,:alist] in oplist _ ; | nalist := koCatOps1(alist)] -(DEFUN |koCatOps| (|conform| |domname|) +(defun |koCatOps| (|conform| |domname|) (PROG (|conname| |oplist| |op| |alist| |nalist|) (RETURN (SEQ (PROGN @@ -8976,7 +8976,7 @@ ; npred := simpHasPred pred => [sig,npred] ; false -(DEFUN |koCatOps1| (|alist|) +(defun |koCatOps1| (|alist|) (PROG (|sig| |r| |key| |options| |pred| |npred| |x|) (RETURN (SEQ (PROG (G173969) @@ -9027,7 +9027,7 @@ ; for [conform,:pred] in ancestors repeat koCatAttrsAdd(conform,pred) ; hashTable2Alist $if -(DEFUN |koCatAttrs| (|catform| |domname|) +(defun |koCatAttrs| (|catform| |domname|) (PROG (|$if| |catname| |ancestors| |conform| |pred|) (DECLARE (SPECIAL |$if|)) (RETURN @@ -9053,7 +9053,7 @@ ;hashTable2Alist tb == ; [[op,:HGET(tb,op)] for op in listSort(function GLESSEQP,HKEYS $if)] -(DEFUN |hashTable2Alist| (|tb|) +(defun |hashTable2Alist| (|tb|) (PROG () (declare (special |$if|)) (RETURN @@ -9081,7 +9081,7 @@ ; if not MEMQ(name,'(nil nothing)) _ ; then HPUT($if,name,[[argl,simpHasPred npred],:exists]) -(DEFUN |koCatAttrsAdd| (|catform| |pred|) +(defun |koCatAttrsAdd| (|catform| |pred|) (PROG (|name| |argl| |p| |exists| |existingPred| |npred|) (declare (special |$if|)) (RETURN @@ -9135,7 +9135,7 @@ ; bcNameCountTable(ancestors,'form2HtString,'koaPageFilterByCategory1,true) ; htShowPage() -(DEFUN |koaPageFilterByCategory| (|htPage| |calledFrom|) +(defun |koaPageFilterByCategory| (|htPage| |calledFrom|) (PROG (|opAlist| |which| |page| |conform| |domname| |ancestors|) (RETURN (PROGN @@ -9186,7 +9186,7 @@ ; pluralSay(count,nil,pluralize capwhich) ; [:prefix,'" for ",:heading] -(DEFUN |dbHeading| +(defun |dbHeading| (&REST G174101 &AUX |options| |heading| |which| |items|) (DSETQ (|items| |which| |heading| . |options|) G174101) (PROG (|names?| |count| |capwhich| |prefix|) @@ -9209,7 +9209,7 @@ G174082) (SEQ (EXIT (SETQ G174082 - (PLUS G174082 (|#| (CDR |x|)))))))))))) + (+ G174082 (|#| (CDR |x|)))))))))))) (SPADLET |capwhich| (|capitalize| |which|)) (SPADLET |prefix| (COND @@ -9256,7 +9256,7 @@ ; '" from category {\sf ",form2HtString ancestor,'"}"]) ; dbShowOperationsFromConform(htPage,which,falist) -(DEFUN |koaPageFilterByCategory1| (|htPage| |i|) +(defun |koaPageFilterByCategory1| (|htPage| |i|) (PROG (|ancestor| |ancestorList| |which| |opAlist| |domname| |conform| |heading| |docTable| |sig| |pred| |aux| |u| |doc| |nalist| |origin| |item| |newEntry| @@ -9393,7 +9393,7 @@ ;--dbResetOpAlistCondition(htPage,which,opAlist) ; dbShowOp1(htPage,opAlist,which,'names) -(DEFUN |opPageFast| (|opAlist|) +(defun |opPageFast| (|opAlist|) (PROG (|htPage| |which|) (RETURN (PROGN @@ -9416,7 +9416,7 @@ ; [sig, predicate, origin, exposed?] ; opAlist -(DEFUN |opPageFastPath| (|opstring|) +(defun |opPageFastPath| (|opstring|) (PROG (|x| |op| |mmList| |LETTMP#1| |predList| |origin| |sig| |predicate| |exposed?| |opAlist|) (RETURN @@ -9502,7 +9502,7 @@ ;--pause nsig ; [predList, origin, SUBST("%", origin, nsig)] -(DEFUN |modemap2Sig| (|op| |mm|) +(defun |modemap2Sig| (|op| |mm|) (PROG (|dc| |sig| |r| |conds| |partial?| |condlist| |origin| |subcondlist| |LETTMP#1| |vlist| |flist| |target| |ntarget| |dcSig| |alist| |predList| |nsig|) @@ -9558,7 +9558,7 @@ ; conds is ['AND,:r] => r ; [conds] -(DEFUN |modemap2SigConds| (|conds|) +(defun |modemap2SigConds| (|conds|) (PROG (|r|) (RETURN (COND @@ -9575,7 +9575,7 @@ ; atom x => false ; or/[hasPatternVar y for y in x] -(DEFUN |hasPatternVar| (|x|) +(defun |hasPatternVar| (|x|) (PROG () (RETURN (SEQ (COND @@ -9604,7 +9604,7 @@ ; [conform, ["*1", :rest cform], ["%", :rest conform]] ; systemError() -(DEFUN |getDcForm| (|dc| |condlist|) +(defun |getDcForm| (|dc| |condlist|) (PROG (|k| |ISTMP#1| |LETTMP#1| |ofWord| |id| |cform| |conform|) (RETURN (SEQ (PROGN @@ -9666,7 +9666,7 @@ ; systemError() ; [pl, vl, fl] -(DEFUN |getSigSubst| (|u| |pl| |vl| |fl|) +(defun |getSigSubst| (|u| |pl| |vl| |fl|) (PROG (|item| |r| |s| |LETTMP#1| |key| |v| |f|) (RETURN (COND @@ -9703,7 +9703,7 @@ ; null u or null v => nil ; [[first u,:first v],:pairlis(rest u, rest v)] -(DEFUN |pairlis| (|u| |v|) +(defun |pairlis| (|u| |v|) (COND ((OR (NULL |u|) (NULL |v|)) NIL) ('T @@ -9728,7 +9728,7 @@ ; MEMQ(key,'(o a)) => dbScreenForDefaultFunctions lines --kill default lines if a/o ; lines -(DEFUN |grepConstruct| (&REST G174459 &AUX |options| |key| |s|) +(defun |grepConstruct| (&REST G174459 &AUX |options| |key| |s|) (DSETQ (|s| |key| . |options|) G174459) (PROG (|$localLibdb| |lines|) (DECLARE (SPECIAL |$localLibdb|)) @@ -9755,7 +9755,7 @@ ; pattern := mkGrepPattern(filter,key) --create string to pass to "grep" ; grepConstructDo(pattern, key) --do the "grep"---see b-saturn.boot -(DEFUN |grepConstruct1| (|s| |key|) +(defun |grepConstruct1| (|s| |key|) (PROG (|$key| |filter| |pattern|) (DECLARE (SPECIAL |$key|)) (RETURN @@ -9792,7 +9792,7 @@ ; UNION(oldLines, newLines) ; grepf(x,key,false) -(DEFUN |grepConstructDo| (|x| |key|) +(defun |grepConstructDo| (|x| |key|) (PROG (|oldLines| |newLines|) (declare (special |$orCount| |$localLibdb| |$newConstructorList|)) (RETURN @@ -9814,7 +9814,7 @@ ; dbName line ; isExposedConstructor conname -(DEFUN |dbExposed?| (|line| |kind|) +(defun |dbExposed?| (|line| |kind|) (PROG (|conname|) (RETURN (PROGN @@ -9828,7 +9828,7 @@ ;dbScreenForDefaultFunctions lines == [x for x in lines | not isDefaultOpAtt x] -(DEFUN |dbScreenForDefaultFunctions| (|lines|) +(defun |dbScreenForDefaultFunctions| (|lines|) (PROG () (RETURN (SEQ (PROG (G174502) @@ -9844,8 +9844,8 @@ ;isDefaultOpAtt x == x.(1 + dbTickIndex(x,4,0)) = char 'x -(DEFUN |isDefaultOpAtt| (|x|) - (BOOT-EQUAL (ELT |x| (PLUS 1 (|dbTickIndex| |x| 4 0))) (|char| '|x|))) +(defun |isDefaultOpAtt| (|x|) + (BOOT-EQUAL (ELT |x| (+ 1 (|dbTickIndex| |x| 4 0))) (|char| '|x|))) ;grepForAbbrev(s,key) == ;--checks that filter s is not * and is all uppercase; if so, look for abbrevs @@ -9865,7 +9865,7 @@ ; a := GETDATABASE(x,'ABBREVIATION) ; match?(pattern,PNAME a) and not HGET($defaultPackageNamesHT,x) -(DEFUN |grepForAbbrev| (|s| |key|) +(defun |grepForAbbrev| (|s| |key|) (declare (ignore |key|)) (PROG (|u| |c| |someLowerCaseChar| |someUpperCaseChar| |pattern| |a|) (declare (special |$includeUnexposed?| |$defaultPackageNamesHT| @@ -9937,7 +9937,7 @@ ; grepCombine(a,b) ; grepf(x,filename,false) -(DEFUN |applyGrep| (|x| |filename|) +(defun |applyGrep| (|x| |filename|) (PROG (|a| |b|) (declare (special |$localLibdb| |$newConstructorList|)) (RETURN @@ -9954,7 +9954,7 @@ ;grepCombine(a,b) == MSORT UNION(a,b) -(DEFUN |grepCombine| (|a| |b|) (MSORT (|union| |a| |b|))) +(defun |grepCombine| (|a| |b|) (MSORT (|union| |a| |b|))) ;grepf(pattern,s,not?) == --s=sourceFile or list of strings ; pattern is [op,:argl] => @@ -9979,7 +9979,7 @@ ; s ; grepFile(pattern,source,option) -(DEFUN |grepf| (|pattern| |s| |not?|) +(defun |grepf| (|pattern| |s| |not?|) (PROG (|op| |arg| |argl| |targetStack| |lines| |option| |source|) (declare (special |$key|)) (RETURN @@ -10040,7 +10040,7 @@ ; => ['error,'"Illegal search string",'"\vspace{3}\center{Consecutive {\em *}'s are not allowed in search patterns}"] ; s -(DEFUN |pmTransFilter| (|s|) +(defun |pmTransFilter| (|s|) (PROG (|parse|) (declare (special |$browseMixedCase| |$charUnderscore|)) (RETURN @@ -10087,7 +10087,7 @@ (BOOT-EQUAL (ELT |s| |i|) (|char| '*)) (BOOT-EQUAL - (ELT |s| (PLUS |i| 1)) + (ELT |s| (+ |i| 1)) (|char| '*)) (OR (EQL |i| 0) (NEQUAL @@ -10109,7 +10109,7 @@ ; false ; nil -(DEFUN |checkPmParse,fn| (|u|) +(defun |checkPmParse,fn| (|u|) (PROG (|op| |args|) (RETURN (SEQ (IF (AND (CONSP |u|) @@ -10135,7 +10135,7 @@ (|checkPmParse| |x|))))))))))) (IF (STRINGP |u|) (EXIT 'T)) (EXIT NIL))))) -(DEFUN |checkPmParse| (|parse|) +(defun |checkPmParse| (|parse|) (COND ((STRINGP |parse|) |parse|) ((|checkPmParse,fn| |parse|) |parse|) @@ -10157,7 +10157,7 @@ ; x is ['and,:argl2] => ['and,:[dnForm u for u in argl2]] ; x -(DEFUN |dnForm,negate| (|s|) +(defun |dnForm,negate| (|s|) (PROG (|ISTMP#1| |argx|) (RETURN (SEQ (IF (AND (CONSP |s|) (EQ (QCAR |s|) '|not|) @@ -10170,7 +10170,7 @@ (EXIT |argx|)) (EXIT (CONS '|not| (CONS |s| NIL))))))) -(DEFUN |dnForm| (|x|) +(defun |dnForm| (|x|) (PROG (|argl| |orargs| |andargs| |ISTMP#1| |notargl| |argl1| |argl2|) (RETURN (SEQ (COND @@ -10267,7 +10267,7 @@ ; [op,:[flatten x for x in argl]] ; s -(DEFUN |pmParseFromString,flatten| (|s|) +(defun |pmParseFromString,flatten| (|s|) (PROG (|op| |argl|) (RETURN (SEQ (IF (AND (CONSP |s|) @@ -10319,7 +10319,7 @@ G174794)))))))))))) (EXIT |s|))))) -(DEFUN |pmParseFromString| (|s|) +(defun |pmParseFromString| (|s|) (PROG (|u|) (RETURN (PROGN @@ -10345,7 +10345,7 @@ ; STRCONC(SUBSTRING(s,i,n - i + 1),$charUnderscore,gn(s,n + 1,j)) ; SUBSTRING(s,i,j - i + 1) -(DEFUN |pmPreparse,gn| (|s| |i| |j|) +(defun |pmPreparse,gn| (|s| |i| |j|) (PROG (|n|) (declare (special |$charUnderscore|)) (RETURN @@ -10363,19 +10363,19 @@ (SETQ G174821 (OR G174821 |k|)))))))))) (EXIT (STRCONC (SUBSTRING |s| |i| - (PLUS (SPADDIFFERENCE |n| |i|) 1)) + (+ (SPADDIFFERENCE |n| |i|) 1)) |$charUnderscore| - (|pmPreparse,gn| |s| (PLUS |n| 1) |j|)))) - (EXIT (SUBSTRING |s| |i| (PLUS (SPADDIFFERENCE |j| |i|) 1))))))) + (|pmPreparse,gn| |s| (+ |n| 1) |j|)))) + (EXIT (SUBSTRING |s| |i| (+ (SPADDIFFERENCE |j| |i|) 1))))))) -(DEFUN |pmPreparse,fn| (|s| |n| |siz|) +(defun |pmPreparse,fn| (|s| |n| |siz|) (PROG (|i| |j| |t| |middle|) (RETURN (SEQ (IF (BOOT-EQUAL |n| |siz|) (EXIT "")) (SPADLET |i| (OR (|firstNonDelim| |s| |n|) (RETURN (SUBSTRING |s| |n| NIL)))) - (SPADLET |j| (OR (|firstDelim| |s| (PLUS |i| 1)) |siz|)) + (SPADLET |j| (OR (|firstDelim| |s| (+ |i| 1)) |siz|)) (SPADLET |t| (|pmPreparse,gn| |s| |i| (SPADDIFFERENCE |j| 1))) (SPADLET |middle| @@ -10393,15 +10393,15 @@ |middle| (|pmPreparse,fn| |s| |j| |siz|))))))) -(DEFUN |pmPreparse,hn| (|x|) +(defun |pmPreparse,hn| (|x|) (SUBLISLIS '(|and| |or| |not|) '("and" "or" "not") |x|)) -(DEFUN |pmPreparse| (|s|) +(defun |pmPreparse| (|s|) (|pmPreparse,hn| (|pmPreparse,fn| |s| 0 (|#| |s|)))) ;firstNonDelim(s,n) == or/[k for k in n..MAXINDEX s | not isFilterDelimiter? s.k] -(DEFUN |firstNonDelim| (|s| |n|) +(defun |firstNonDelim| (|s| |n|) (PROG () (RETURN (SEQ (PROG (G174852) @@ -10417,7 +10417,7 @@ ;firstDelim(s,n) == or/[k for k in n..MAXINDEX s | isFilterDelimiter? s.k] -(DEFUN |firstDelim| (|s| |n|) +(defun |firstDelim| (|s| |n|) (PROG () (RETURN (SEQ (PROG (G174869) @@ -10432,7 +10432,7 @@ ;isFilterDelimiter? c == MEMQ(c,$pmFilterDelimiters) -(DEFUN |isFilterDelimiter?| (|c|) +(defun |isFilterDelimiter?| (|c|) (declare (special |$pmFilterDelimiters|)) (member |c| |$pmFilterDelimiters|)) @@ -10467,7 +10467,7 @@ ;-- ['"default_ package",:NREVERSE defs] -- drop defaults ; ] -(DEFUN |grepSplit| (|lines| |doc?|) +(defun |grepSplit| (|lines| |doc?|) (PROG (|instream2| CONS N |line| |kind| |cats| |doms| |defs| |paks| |atts| |ops|) (declare (special |$includeUnexposed?|)) @@ -10549,18 +10549,18 @@ ; STRCONC(char '_[,CHAR_-UPCASE c,CHAR_-DOWNCASE c,char '_]) ; c -(DEFUN |mkUpDownPattern,fixchar| (|c|) +(defun |mkUpDownPattern,fixchar| (|c|) (SEQ (IF (ALPHA-CHAR-P |c|) (EXIT (STRCONC (|char| '[) (CHAR-UPCASE |c|) (CHAR-DOWNCASE |c|) (|char| '])))) (EXIT |c|))) -(DEFUN |mkUpDownPattern,recurse| (|s| |i| |n|) +(defun |mkUpDownPattern,recurse| (|s| |i| |n|) (SEQ (IF (BOOT-EQUAL |i| |n|) (EXIT "")) (EXIT (STRCONC (|mkUpDownPattern,fixchar| (ELT |s| |i|)) - (|mkUpDownPattern,recurse| |s| (PLUS |i| 1) |n|))))) + (|mkUpDownPattern,recurse| |s| (+ |i| 1) |n|))))) -(DEFUN |mkUpDownPattern| (|s|) +(defun |mkUpDownPattern| (|s|) (|mkUpDownPattern,recurse| |s| 0 (|#| |s|))) ;mkGrepPattern(s,key) == @@ -10568,7 +10568,7 @@ ; atom s => mkGrepPattern1(s,key) ; [first s,:[mkGrepPattern(x,key) for x in rest s]] -(DEFUN |mkGrepPattern| (|s| |key|) +(defun |mkGrepPattern| (|s| |key|) (PROG () (RETURN (SEQ (COND @@ -10650,7 +10650,7 @@ ; s = $wild1 => STRCONC('"^",prefix) ; STRCONC('"^",prefix,s) -(DEFUN |mkGrepPattern1,addOptions| (|s|) +(defun |mkGrepPattern1,addOptions| (|s|) (PROG (|x| |one| |tick| |prefix|) (declare (special |$options| |$wild1|)) (RETURN @@ -10690,7 +10690,7 @@ (EXIT (STRCONC "^" |prefix|))) (EXIT (STRCONC "^" |prefix| |s|)))))) -(DEFUN |mkGrepPattern1,charPosition| (|c| |t| |startpos|) +(defun |mkGrepPattern1,charPosition| (|c| |t| |startpos|) (PROG (|n| |k|) (RETURN (SEQ (SPADLET |n| (SIZE |t|)) @@ -10706,19 +10706,19 @@ (ELT |t| (SPADDIFFERENCE |i| 1)) '_))))) NIL) - (SEQ (EXIT (SPADLET |k| (PLUS |k| 1))))) + (SEQ (EXIT (SPADLET |k| (+ |k| 1))))) (EXIT |k|))))) -(DEFUN |mkGrepPattern1,split| (|s| |char|) +(defun |mkGrepPattern1,split| (|s| |char|) (PROG (|max| |i| |f|) (RETURN - (SEQ (SPADLET |max| (PLUS (MAXINDEX |s|) 1)) + (SEQ (SPADLET |max| (+ (MAXINDEX |s|) 1)) (SPADLET |f| (SPADDIFFERENCE 1)) (EXIT (PROG (G175010) (SPADLET G175010 NIL) (RETURN (DO () - ((NULL (AND (<= (SPADLET |i| (PLUS |f| 1)) + ((NULL (AND (<= (SPADLET |i| (+ |f| 1)) |max|) (SPADLET |f| (|mkGrepPattern1,charPosition| @@ -10730,7 +10730,7 @@ (SPADDIFFERENCE |f| |i|)) G175010)))))))))))) -(DEFUN |mkGrepPattern1,remUnderscores| (|s|) +(defun |mkGrepPattern1,remUnderscores| (|s|) (PROG (|k|) (declare (special |$charUnderscore|)) (RETURN @@ -10739,12 +10739,12 @@ (|mkGrepPattern1,charPosition| (|char| |$charUnderscore|) |s| 0))) (EXIT (STRCONC (SUBSTRING |s| 0 |k|) "[" - (ELT |s| (PLUS |k| 1)) "]" + (ELT |s| (+ |k| 1)) "]" (|mkGrepPattern1,remUnderscores| - (SUBSTRING |s| (PLUS |k| 2) NIL))))) + (SUBSTRING |s| (+ |k| 2) NIL))))) (EXIT |s|))))) -(DEFUN |mkGrepPattern1,h| (|sl| |res|) +(defun |mkGrepPattern1,h| (|sl| |res|) (PROG (|s| |ISTMP#1| |p| |r|) (declare (special |$wild1| |$options|)) (RETURN @@ -10783,7 +10783,7 @@ (SEQ (EXIT (SETQ G175030 (STRCONC G175030 G174956)))))))))))) -(DEFUN |mkGrepPattern1,g| (|s|) +(defun |mkGrepPattern1,g| (|s|) (PROG (|k|) (declare (special |$options|)) (RETURN @@ -10795,13 +10795,13 @@ (SPADLET |s| (SUBSTRING |s| 0 |k|)) NIL) (EXIT |s|))))) -(DEFUN |mkGrepPattern1,addWilds| (|sl|) +(defun |mkGrepPattern1,addWilds| (|sl|) (declare (special |$wild1|)) (SEQ (IF (BOOT-EQUAL (IFCAR |sl|) "") (EXIT (|mkGrepPattern1,h| (IFCDR |sl|) (CONS |$wild1| NIL)))) (EXIT (|mkGrepPattern1,h| |sl| NIL)))) -(DEFUN |mkGrepPattern1| (&REST G175071 &AUX |options| |x|) +(defun |mkGrepPattern1| (&REST G175071 &AUX |options| |x|) (DSETQ (|x| . |options|) G175071) (PROG (|$options| |s|) (DECLARE (SPECIAL |$options|)) @@ -10828,7 +10828,7 @@ ; algCoerceInteractive(x,typ,'(OutputForm)) ; [op,:sargl] -(DEFUN |conform2OutputForm| (|form|) +(defun |conform2OutputForm| (|form|) (PROG (|op| |args| |cosig| |atypes| |typ| |ISTMP#1| |a| |sargl|) (RETURN (SEQ (PROGN @@ -10901,7 +10901,7 @@ ;oPage(a,:b) == --called by \spadfun{opname} ; oSearch (IFCAR b or a) --always take slow path -(DEFUN |oPage| (&REST G175141 &AUX |b| |a|) +(defun |oPage| (&REST G175141 &AUX |b| |a|) (DSETQ (|a| . |b|) G175141) (|oSearch| (OR (IFCAR |b|) |a|))) @@ -10914,7 +10914,7 @@ ; opAlist := [itemlist] ; dbShowOperationsFromConform(htPage,'"operation",opAlist) -(DEFUN |oPageFrom| (|opname| |conname|) +(defun |oPageFrom| (|opname| |conname|) (PROG (|htPage| |conform| |itemlist| |opAlist|) (RETURN (PROGN @@ -10944,7 +10944,7 @@ ; $attributeArgs : local := IFCAR IFCDR s ; aSearch searchOn -(DEFUN |aPage| (&REST G175164 &AUX |b| |a|) +(defun |aPage| (&REST G175164 &AUX |b| |a|) (DSETQ (|a| . |b|) G175164) (PROG (|$attributeArgs| |arg| |s| |searchOn|) (DECLARE (SPECIAL |$attributeArgs|)) @@ -10968,7 +10968,7 @@ ; looksLikeDomainForm form => APPLY(function conPage,form) ; conPage(op) -(DEFUN |spadType| (|x|) +(defun |spadType| (|x|) (PROG (|s| |form| |op|) (RETURN (PROGN @@ -10999,7 +10999,7 @@ ; key => looksLikeDomainForm arg ; not IDENTP arg -(DEFUN |looksLikeDomainForm| (|x|) +(defun |looksLikeDomainForm| (|x|) (PROG (|entry| |coSig| |k|) (RETURN (SEQ (PROGN @@ -11039,7 +11039,7 @@ ; systemError ['"Argument: ",s,'" to spadType won't parse"] ; htSystemCommands PNAME opOf form -(DEFUN |spadSys| (|x|) +(defun |spadSys| (|x|) (PROG (|s| |form|) (RETURN (PROGN @@ -11062,7 +11062,7 @@ ;--======================================================================= ;aokSearch filter == genSearch(filter,true) --"General" from HD (see man0.ht) -(DEFUN |aokSearch| (|filter|) (|genSearch| |filter| 'T)) +(defun |aokSearch| (|filter|) (|genSearch| |filter| 'T)) ;--General search for constructs but NOT documentation ;genSearch(filter,:options) == --"Complete" from HD (see man0.ht) and aokSearch @@ -11080,7 +11080,7 @@ ; docSearchAlist := [x for x in docSearchAlist | x.0 ^= char 'x]--drop defaults ; genSearch1(filter,genSearchTran regSearchAlist,genSearchTran docSearchAlist) -(DEFUN |genSearch| (&REST G175241 &AUX |options| |filter|) +(defun |genSearch| (&REST G175241 &AUX |options| |filter|) (DSETQ (|filter| . |options|) G175241) (PROG (|includeDoc?| |regSearchAlist| |key| |docSearchAlist|) (RETURN @@ -11131,7 +11131,7 @@ ;genSearchTran alist == [[x,y,:y] for [x,:y] in alist] -(DEFUN |genSearchTran| (|alist|) +(defun |genSearchTran| (|alist|) (PROG (|x| |y|) (RETURN (SEQ (PROG (G175251) @@ -11194,7 +11194,7 @@ ; genSearchSay(pair,true,kind,i,'showDoc) ; htShowPageStar() -(DEFUN |genSearch1| (|filter| |reg| |doc|) +(defun |genSearch1| (|filter| |reg| |doc|) (PROG (|regSearchAlist| |docSearchAlist| |key| |regCount| |docCount| |count| |alist| |nonEmpties| |summarize?| |plural| |prefix| |emfilter| |header| |page| |kind| |pair|) @@ -11208,7 +11208,7 @@ (SPADLET |key| (|removeSurroundingStars| |filter|)) (SPADLET |regCount| (|searchCount| |regSearchAlist|)) (SPADLET |docCount| (|searchCount| |docSearchAlist|)) - (SPADLET |count| (PLUS |regCount| |docCount|)) + (SPADLET |count| (+ |regCount| |docCount|)) (COND ((EQL |count| 0) (|emptySearchPage| "entry" |filter| 'T)) @@ -11361,7 +11361,7 @@ ; not $exposedOnlyIfTrue or dbExposed?(line,dbKind line) => line ; nil -(DEFUN |searchDropUnexposedLines| (|alist|) +(defun |searchDropUnexposedLines| (|alist|) (PROG (|op| |lines|) (declare (special |$exposedOnlyIfTrue|)) (RETURN @@ -11432,7 +11432,7 @@ ; reg => genSearch1(filter,reg,doc) ; docSearch1(filter,doc) -(DEFUN |repeatSearch| (|htPage| |newValue|) +(defun |repeatSearch| (|htPage| |newValue|) (PROG (|filter| |reg| |doc|) (declare (special |$exposedOnlyIfTrue|)) (RETURN @@ -11447,7 +11447,7 @@ ;searchCount u == +/[# y for [x,y,:.] in u] -(DEFUN |searchCount| (|u|) +(defun |searchCount| (|u|) (PROG (|x| |y|) (RETURN (SEQ (PROG (G175437) @@ -11463,19 +11463,19 @@ G175433) NIL)) G175437) - (SEQ (EXIT (SETQ G175437 (PLUS G175437 (|#| |y|)))))))))))) + (SEQ (EXIT (SETQ G175437 (+ G175437 (|#| |y|)))))))))))) ;showDoc(htPage,count) == ; showIt(htPage,count,htpProperty(htPage,'docSearchAlist)) -(DEFUN |showDoc| (|htPage| |count|) +(defun |showDoc| (|htPage| |count|) (|showIt| |htPage| |count| (|htpProperty| |htPage| '|docSearchAlist|))) ;showConstruct(htPage,count) == ; showIt(htPage,count,htpProperty(htPage,'regSearchAlist)) -(DEFUN |showConstruct| (|htPage| |count|) +(defun |showConstruct| (|htPage| |count|) (|showIt| |htPage| |count| (|htpProperty| |htPage| '|regSearchAlist|))) @@ -11489,7 +11489,7 @@ ; lines := [line for line in items while dbName line = firstName] ; showNamedConstruct [kind,nil,:lines] -(DEFUN |showIt| (|htPage| |index| |searchAlist|) +(defun |showIt| (|htPage| |index| |searchAlist|) (PROG (|filter| |relativeIndex| |n| |LETTMP#1| |kind| |items| |firstName| |lines|) (RETURN @@ -11529,7 +11529,7 @@ ;showNamedConstruct([kind,.,:lines]) == dbSearch(lines,kind,'"") -(DEFUN |showNamedConstruct| (G175516) +(defun |showNamedConstruct| (G175516) (PROG (|kind| |lines|) (RETURN (PROGN @@ -11572,7 +11572,7 @@ ; htEndTable() ; htSayStandard '"\indent{0}" -(DEFUN |genSearchSay| (|pair| |summarize| |kind| |who| |fn|) +(defun |genSearchSay| (|pair| |summarize| |kind| |who| |fn|) (PROG (|u| |fullLineList| |count| |uniqueCount| |short| |lastid| |groups| |id| |exposed?| |i|) (declare (special |$browseCountThreshold| |$includeUnexposed?|)) @@ -11663,11 +11663,11 @@ (CONS "" (CONS |fn| (CONS - (PLUS |who| (TIMES 8 |i|)) + (+ |who| (TIMES 8 |i|)) NIL)))) NIL)) NIL)) - (SPADLET |i| (PLUS |i| (|#| |group|))) + (SPADLET |i| (+ |i| (|#| |group|))) (|bcHt| "}"))))) (COND ((NEQUAL |uniqueCount| 1) (|htEndTable|) @@ -11678,7 +11678,7 @@ ; [[(u := rest u; x) while u and head = dbName (x := first u)] ; while u and (head := dbName first u)] -(DEFUN |organizeByName| (|u|) +(defun |organizeByName| (|u|) (PROG (|head| |x|) (RETURN (SEQ (PROG (G175590) @@ -11715,7 +11715,7 @@ ; filter := htpProperty(htPage,'filter) ; dbSearch(lines,kind,filter) -(DEFUN |genSearchSayJump| (|htPage| G175625) +(defun |genSearchSayJump| (|htPage| G175625) (PROG (|lines| |kind| |filter|) (RETURN (PROGN @@ -11735,7 +11735,7 @@ ; lastid := id ; count -(DEFUN |genSearchUniqueCount| (|u|) +(defun |genSearchUniqueCount| (|u|) (PROG (|id| |count| |lastid|) (declare (special |$browseCountThreshold|)) (RETURN @@ -11751,14 +11751,14 @@ (SPADLET |id| (|dbGetName| |item|)) (COND ((NEQUAL |id| |lastid|) - (SPADLET |count| (PLUS |count| 1)) + (SPADLET |count| (+ |count| 1)) (SPADLET |lastid| |id|)) ('T NIL)))))) |count|))))) ;dbGetName line == SUBSTRING(line,1,charPosition($tick,line,1) - 1) -(DEFUN |dbGetName| (|line|) +(defun |dbGetName| (|line|) (declare (special |$tick|)) (SUBSTRING |line| 1 (SPADDIFFERENCE (|charPosition| |$tick| |line| 1) 1))) @@ -11770,7 +11770,7 @@ ; count = 1 => concat('"1 ",singular,item,colon) ; concat(count,'" ",plural,item,colon) -(DEFUN |pluralSay| +(defun |pluralSay| (&REST G175680 &AUX |options| |plural| |singular| |count|) (DSETQ (|count| |singular| |plural| . |options|) G175680) (PROG (|x| |item| |colon|) @@ -11809,7 +11809,7 @@ ; docSearchAlist := [x for x in docSearchAlist | x.0 ^= char 'x] --drop defaults ; docSearch1(filter,genSearchTran docSearchAlist) -(DEFUN |docSearch| (|filter|) +(defun |docSearch| (|filter|) (PROG (|key| |docSearchAlist|) (RETURN (SEQ (COND @@ -11863,7 +11863,7 @@ ; genSearchSay(pair,true,kind,i,'showDoc) ; htShowPageStar() -(DEFUN |docSearch1| (|filter| |doc|) +(defun |docSearch1| (|filter| |doc|) (PROG (|docSearchAlist| |count| |prefix| |emfilter| |header| |page| |kind| |pair|) (RETURN @@ -11944,7 +11944,7 @@ ; if key.(max := MAXINDEX key) = char '_* then key := SUBSTRING(key,0,max) ; key -(DEFUN |removeSurroundingStars| (|filter|) +(defun |removeSurroundingStars| (|filter|) (PROG (|max| |key|) (RETURN (PROGN @@ -11961,7 +11961,7 @@ ;showNamedDoc([kind,:lines],index) == ; dbGather(kind,lines,index - 1,true) -(DEFUN |showNamedDoc| (G175764 |index|) +(defun |showNamedDoc| (G175764 |index|) (PROG (|kind| |lines|) (RETURN (PROGN @@ -11981,7 +11981,7 @@ ; htSay message ; htSay ('"}") -(DEFUN |sayDocMessage| (|message|) +(defun |sayDocMessage| (|message|) (PROG (|leftEnd| |ISTMP#1| |left| |ISTMP#2| |middle| |ISTMP#3| |right| |ISTMP#4| |rightEnd|) (declare (special |$blank|)) @@ -12038,7 +12038,7 @@ ; n = 0 => s ; nil -(DEFUN |stripOffSegments| (|s| |n|) +(defun |stripOffSegments| (|s| |n|) (PROG (|k| |new| |progress|) (RETURN (SEQ (PROGN @@ -12052,7 +12052,7 @@ (|charPosition| (|char| '|`|) |s| 0)) (SPADLET |new| - (SUBSTRING |s| (PLUS |k| 1) NIL)) + (SUBSTRING |s| (+ |k| 1) NIL)) (COND ((QSLESSP (|#| |new|) (|#| |s|)) (SPADLET |s| |new|)) @@ -12065,7 +12065,7 @@ ; while (n := charPosition(char '_`,s,n + 1)) <= max repeat SETELT(s,n,char '_ ) ; s -(DEFUN |replaceTicksBySpaces| (|s|) +(defun |replaceTicksBySpaces| (|s|) (PROG (|max| |n|) (RETURN (SEQ (PROGN @@ -12074,7 +12074,7 @@ (DO () ((NULL (<= (SPADLET |n| (|charPosition| (|char| '|`|) |s| - (PLUS |n| 1))) + (+ |n| 1))) |max|)) NIL) (SEQ (EXIT (SETELT |s| |n| (|char| '| |))))) @@ -12084,7 +12084,7 @@ ; null (filter := checkFilter filter) => nil --in case of filter error ; dbSearch(grepConstruct(filter,'a),'"attribute",filter) -(DEFUN |aSearch| (|filter|) +(defun |aSearch| (|filter|) (COND ((NULL (SPADLET |filter| (|checkFilter| |filter|))) NIL) ('T @@ -12098,7 +12098,7 @@ ; filter = '"*" => grepSearchQuery('"operation",[filter,key,'"operation",'oSearchGrep]) ; oSearchGrep(filter,key,'"operation") -(DEFUN |oSearch| (|filter|) +(defun |oSearch| (|filter|) (PROG (|opAlist| |key|) (RETURN (COND @@ -12118,7 +12118,7 @@ ;oSearchGrep(filter,key,kind) == --called from grepSearchQuery/oSearch ; dbSearch(grepConstruct(filter,'o),kind,filter) -(DEFUN |oSearchGrep| (|filter| |key| |kind|) +(defun |oSearchGrep| (|filter| |key| |kind|) (declare (ignore |key|)) (|dbSearch| (|grepConstruct| |filter| '|o|) |kind| |filter|)) @@ -12128,7 +12128,7 @@ ; htQuery(['"{\em Do you want a list of {\em all} ",pluralize kind,'"?\vspace{1}}"],'grepSearchJump,true) ; htShowPage() -(DEFUN |grepSearchQuery| (|kind| |items|) +(defun |grepSearchQuery| (|kind| |items|) (PROG (|page|) (RETURN (PROGN @@ -12143,7 +12143,7 @@ ;grepConstructorSearch(htPage,yes) == kPage htpProperty(htPage,'line) -(DEFUN |grepConstructorSearch| (|htPage| |yes|) +(defun |grepConstructorSearch| (|htPage| |yes|) (declare (ignore |yes|)) (|kPage| (|htpProperty| |htPage| '|line|))) @@ -12152,7 +12152,7 @@ ; atom x => x ; [conLowerCaseConTranTryHarder y for y in x] -(DEFUN |conLowerCaseConTranTryHarder| (|x|) +(defun |conLowerCaseConTranTryHarder| (|x|) (PROG () (declare (special |$lowerCaseConTb|)) (RETURN @@ -12177,14 +12177,14 @@ ;constructorSearchGrep(filter,key,kind) == ; dbSearch(grepConstruct(filter,key),kind,filter) -(DEFUN |constructorSearchGrep| (|filter| |key| |kind|) +(defun |constructorSearchGrep| (|filter| |key| |kind|) (|dbSearch| (|grepConstruct| |filter| |key|) |kind| |filter|)) ;grepSearchJump(htPage,yes) == ; [filter,key,kind,fn] := htpProperty(htPage,'items) ; FUNCALL(fn,filter,key,kind) -(DEFUN |grepSearchJump| (|htPage| |yes|) +(defun |grepSearchJump| (|htPage| |yes|) (declare (special |yes|)) (PROG (|LETTMP#1| |filter| |key| |kind| |fn|) (RETURN @@ -12210,7 +12210,7 @@ ; MEMBER(kind,'("attribute" "operation")) => dbShowOperationLines(kind,lines) ; dbShowConstructorLines lines -(DEFUN |dbSearch| (|lines| |kind| |filter|) +(defun |dbSearch| (|lines| |kind| |filter|) (PROG (|r| |count|) (RETURN (COND @@ -12254,7 +12254,7 @@ ; bcCon nam ; htShowPage() -(DEFUN |dbSearchAbbrev| (G176172 |kind| |filter|) +(defun |dbSearchAbbrev| (G176172 |kind| |filter|) (PROG (|conlist| |ISTMP#1| |cAlist| |htPage| |page| |nam| |abbr| |r| |s|) (RETURN @@ -12402,7 +12402,7 @@ ; (text . "}")) ; htShowPage() -(DEFUN |detailedSearch| (|filter|) +(defun |detailedSearch| (|filter|) (PROG (|page|) (RETURN (PROGN @@ -12497,7 +12497,7 @@ ; null lines => emptySearchPage(kind,nil) ; dbSearch(lines,kind,'"filter") -(DEFUN |generalSearchDo| (|htPage| |flag|) +(defun |generalSearchDo| (|htPage| |flag|) (declare (ignore |flag|)) (PROG (|alist| |which| |selectors| |name| |nargs| |npat| |acc| |n| |kindCode| |form| |lines| |kind|) @@ -12578,7 +12578,7 @@ ; string = '"" => '"*" ; string -(DEFUN |generalSearchString| (|htPage| |sel|) +(defun |generalSearchString| (|htPage| |sel|) (PROG (|string|) (RETURN (PROGN @@ -12590,7 +12590,7 @@ ;htButtonOn?(htPage,key) == ; LASSOC(key,htpInputAreaAlist htPage) is [a,:.] and a = '" t" -(DEFUN |htButtonOn?| (|htPage| |key|) +(defun |htButtonOn?| (|htPage| |key|) (PROG (|ISTMP#1| |a|) (RETURN (AND (PROGN @@ -12622,7 +12622,7 @@ ; => simp SUBSTRING(a,0,m-5) ; a -(DEFUN |mkDetailedGrepPattern,simp| (|a|) +(defun |mkDetailedGrepPattern,simp| (|a|) (PROG (|m|) (declare (special |$tick|)) (RETURN @@ -12648,14 +12648,14 @@ (SUBSTRING |a| 0 (SPADDIFFERENCE |m| 5))))) (EXIT |a|))))) -(DEFUN |mkDetailedGrepPattern,conc| (|a| |b|) +(defun |mkDetailedGrepPattern,conc| (|a| |b|) (declare (special |$tick|)) (SEQ (IF (OR (BOOT-EQUAL |b| "[^`]*") (BOOT-EQUAL |b| (|char| (INTERN "." "BOOT")))) (EXIT |a|)) (EXIT (STRCONC |a| |$tick| |b|)))) -(DEFUN |mkDetailedGrepPattern| (|kind| |name| |nargs| |argOrSig|) +(defun |mkDetailedGrepPattern| (|kind| |name| |nargs| |argOrSig|) (PROG (|nottick| |firstPart| |nargsPart| |exposedPart| |patPart|) (declare (special |$saturn| |$tick|)) (RETURN @@ -12683,7 +12683,7 @@ ; i > final => s ; STRCONC(SUBSTRING(s,0,i),'"[^`]*",replaceGrepStar SUBSTRING(s,i + 1,nil)) -(DEFUN |replaceGrepStar| (|s|) +(defun |replaceGrepStar| (|s|) (PROG (|final| |i|) (RETURN (COND @@ -12695,7 +12695,7 @@ ('T (STRCONC (SUBSTRING |s| 0 |i|) "[^`]*" (|replaceGrepStar| - (SUBSTRING |s| (PLUS |i| 1) NIL)))))))))) + (SUBSTRING |s| (+ |i| 1) NIL)))))))))) ;standardizeSignature(s) == underscoreDollars ; s.0 = char '_( => s @@ -12703,7 +12703,7 @@ ; s.(k - 1) = char '_) => STRCONC(char '_(,s) ; STRCONC(char '_(,SUBSTRING(s,0,k),char '_),SUBSTRING(s,k,nil)) -(DEFUN |standardizeSignature| (|s|) +(defun |standardizeSignature| (|s|) (PROG (|k|) (RETURN (|underscoreDollars| @@ -12727,7 +12727,7 @@ ; (m := charPosition(char '_$,s,i)) > n => SUBSTRING(s,i,nil) ; STRCONC(SUBSTRING(s,i,m - i),'"___$",fn(s,m + 1,n)) -(DEFUN |underscoreDollars,fn| (|s| |i| |n|) +(defun |underscoreDollars,fn| (|s| |i| |n|) (PROG (|m|) (RETURN (SEQ (IF (> |i| |n|) (EXIT "")) @@ -12736,9 +12736,9 @@ (EXIT (SUBSTRING |s| |i| NIL))) (EXIT (STRCONC (SUBSTRING |s| |i| (SPADDIFFERENCE |m| |i|)) "_$" - (|underscoreDollars,fn| |s| (PLUS |m| 1) |n|))))))) + (|underscoreDollars,fn| |s| (+ |m| 1) |n|))))))) -(DEFUN |underscoreDollars| (|s|) +(defun |underscoreDollars| (|s|) (|underscoreDollars,fn| |s| 0 (MAXINDEX |s|))) ;--======================================================================= @@ -12748,7 +12748,7 @@ ; $saturn and not $aixTestSaturn => nil ; OBEY x -(DEFUN |obey| (|x|) +(defun |obey| (|x|) (declare (special |$aixTestSaturn| |$saturn|)) (COND ((AND |$saturn| (NULL |$aixTestSaturn|)) NIL) ('T (OBEY |x|)))) @@ -12760,7 +12760,7 @@ ; obey STRCONC('"rm -f ", pathname) ; pathname -(DEFUN |getTempPath| (|kind|) +(defun |getTempPath| (|kind|) (PROG (|pathname|) (RETURN (PROGN @@ -12781,7 +12781,7 @@ ; CLOSE instream ; line -(DEFUN |dbGetCommentOrigin| (|line|) +(defun |dbGetCommentOrigin| (|line|) (PROG (|firstPart| |key| |address| |instream|) (RETURN (PROGN @@ -12802,7 +12802,7 @@ ; MEMQ(key, '(_. a c d k o p x)) => 'libdb ; 'comdb -(DEFUN |grepSource| (|key|) +(defun |grepSource| (|key|) (declare (special $SPADROOT |$localLibdb|)) (COND ((BOOT-EQUAL |key| '|libdb|) @@ -12818,7 +12818,7 @@ ;mkGrepTextfile s == STRCONC($SPADROOT,"/algebra/", STRINGIMAGE s, '".text") -(DEFUN |mkGrepTextfile| (|s|) +(defun |mkGrepTextfile| (|s|) (declare (special $spadroot)) (STRCONC $SPADROOT '|/algebra/| (STRINGIMAGE |s|) ".text")) @@ -12830,7 +12830,7 @@ ; suffix := getEnv '"SPADNUM" ; STRCONC(prefix, PNAME s,'".txt.", suffix) -(DEFUN |mkGrepFile| (|s|) +(defun |mkGrepFile| (|s|) (PROG (|prefix| |suffix|) (declare (special |$standard| |$aixTestSaturn| $spadroot)) (RETURN @@ -12868,7 +12868,7 @@ ; GREP(source, pattern, false, not invert?) ; dbUnpatchLines lines -(DEFUN |grepFile| (&REST G176432 &AUX |options| |pattern|) +(defun |grepFile| (&REST G176432 &AUX |options| |pattern|) (DSETQ (|pattern| . |options|) G176432) (PROG (|x| |key| |source| |target| |casepart| |command| |invert?| |lines|) @@ -12922,7 +12922,7 @@ ; -- following call to NREVERSE needed to keep lines properly sorted ; NREVERSE acc ------> added by BMT 12/95 -(DEFUN |dbUnpatchLines| (|lines|) +(defun |dbUnpatchLines| (|lines|) (PROG (|dash| |line| |acc|) (RETURN (SEQ (PROGN @@ -12965,7 +12965,7 @@ ;--======================================================================= ;browserAutoloadOnceTrigger() == nil -(DEFUN |browserAutoloadOnceTrigger| () NIL) +(defun |browserAutoloadOnceTrigger| () NIL) ;----------------------> Global Variables <----------------------- ;$includeUnexposed? := true --default setting @@ -13099,7 +13099,7 @@ $dbKindAlist := ;bcBlankLine() == bcHt '"\vspace{1}\newline " -(DEFUN |bcBlankLine| () (|bcHt| "\\vspace{1}\\newline ")) +(defun |bcBlankLine| () (|bcHt| "\\vspace{1}\\newline ")) ;pluralize k == ; k = '"child" => '"children" @@ -13107,7 +13107,7 @@ $dbKindAlist := ; k = '"entry" => '"entries" ; STRCONC(k,'"s") -(DEFUN |pluralize| (|k|) +(defun |pluralize| (|k|) (COND ((BOOT-EQUAL |k| "child") "children") ((BOOT-EQUAL |k| "category") @@ -13125,7 +13125,7 @@ $dbKindAlist := ; SETELT(res,0,UPCASE res.0) ; res -(DEFUN |capitalize| (|s|) +(defun |capitalize| (|s|) (PROG (|res|) (RETURN (OR (LASSOC |s| @@ -13212,7 +13212,7 @@ $dbKindAlist := ; [CONCAT('"_\",u)] ; [u] -(DEFUN |escapeSpecialIds| (|u|) +(defun |escapeSpecialIds| (|u|) (PROG (|x| |c|) (declare (special |$htCharAlist| |$htSpecialChars|)) (RETURN @@ -13251,7 +13251,7 @@ $dbKindAlist := ; look := look + 2 ; com -(DEFUN |escapeString| (|com|) +(defun |escapeString| (|com|) (PROG (|look|) (RETURN (SEQ (PROGN @@ -13268,7 +13268,7 @@ $dbKindAlist := (|look| (SPADLET |com| (RPLACSTR |com| |look| 0 "\\")) - (SPADLET |look| (PLUS |look| 2))) + (SPADLET |look| (+ |look| 2))) ('T NIL))))))) |com|))))) @@ -13316,7 +13316,7 @@ $dbKindAlist := ; MEMBER(s,$emList) => htSay('"{\em ",s,'"}") ; satDownLink(s, ['"(|aPage| '|",s,'"|)"]) -(DEFUN |htPred2English,fnAttr| (|c|) +(defun |htPred2English,fnAttr| (|c|) (PROG (|s|) (declare (special |$emList|)) (RETURN @@ -13328,7 +13328,7 @@ $dbKindAlist := (CONS "(|aPage| '|" (CONS |s| (CONS "|)" NIL))))))))) -(DEFUN |htPred2English,gn| (|x| |op| |l| |prec|) +(defun |htPred2English,gn| (|x| |op| |l| |prec|) (declare (ignore |prec|)) (PROG (|a| |b| |ISTMP#1| |c|) (declare (special |$emList|)) @@ -13365,7 +13365,7 @@ $dbKindAlist := (EXIT (|bcConform| |b| |$emList|))))) (EXIT (|bcConform| |x| |$emList|)))))) -(DEFUN |htPred2English,fn| (|x| |prec|) +(defun |htPred2English,fn| (|x| |prec|) (PROG (|op| |l| |ISTMP#1| |iprec| |rename|) (declare (special |$precList| |$emList|)) (RETURN @@ -13419,7 +13419,7 @@ $dbKindAlist := (EXIT (|htSay| (|escapeSpecialIds| (PNAME |x|))))) (EXIT (|htSay| (|form2HtString| |x| |$emList|))))))) -(DEFUN |htPred2English| (&REST G176574 &AUX |options| |x|) +(defun |htPred2English| (&REST G176574 &AUX |options| |x|) (DSETQ (|x| . |options|) G176574) (PROG (|$emList| |$precList|) (DECLARE (SPECIAL |$emList| |$precList|)) @@ -13436,7 +13436,7 @@ $dbKindAlist := ; u is ['LIST,:r] => [unMkEvalable x for x in r] ; u -(DEFUN |unMkEvalable| (|u|) +(defun |unMkEvalable| (|u|) (PROG (|ISTMP#1| |a| |r|) (RETURN (SEQ (COND @@ -13466,7 +13466,7 @@ $dbKindAlist := ; ATOM u => systemError() ; ['"_(",:"append"/[fn x for x in u],'")"] -(DEFUN |lisp2HT,fn| (|u|) +(defun |lisp2HT,fn| (|u|) (PROG () (RETURN (SEQ (IF (IDENTP |u|) (EXIT (|escapeSpecialIds| (PNAME |u|)))) @@ -13492,14 +13492,14 @@ $dbKindAlist := (CONS ")" NIL)))))))) -(DEFUN |lisp2HT| (|u|) (CONS "'" (|lisp2HT,fn| |u|))) +(defun |lisp2HT| (|u|) (CONS "'" (|lisp2HT,fn| |u|))) ;args2HtString(x,:options) == ; null x => '"" ; emList := IFCAR options ; SUBSTRING(form2HtString(['f,:x],emList),1,nil) -(DEFUN |args2HtString| (&REST G176627 &AUX |options| |x|) +(defun |args2HtString| (&REST G176627 &AUX |options| |x|) (DSETQ (|x| . |options|) G176627) (PROG (|emList|) (RETURN @@ -13512,7 +13512,7 @@ $dbKindAlist := ; atom x => STRINGIMAGE x ; form2HtString x -(DEFUN |quickForm2HtString| (|x|) +(defun |quickForm2HtString| (|x|) (COND ((ATOM |x|) (STRINGIMAGE |x|)) ('T (|form2HtString| |x|)))) ;form2HtString(x,:options) == @@ -13542,18 +13542,18 @@ $dbKindAlist := ; null x => '"" ; STRCONC('",",fn first x,fnTailTail rest x) -(DEFUN |form2HtString,fnTailTail| (|x|) +(defun |form2HtString,fnTailTail| (|x|) (SEQ (IF (NULL |x|) (EXIT "")) (EXIT (STRCONC "," (|form2HtString,fn| (CAR |x|)) (|form2HtString,fnTailTail| (CDR |x|)))))) -(DEFUN |form2HtString,fnTail| (|x| |str|) +(defun |form2HtString,fnTail| (|x| |str|) (SEQ (IF (NULL |x|) (EXIT "")) (EXIT (STRCONC (ELT |str| 0) (|form2HtString,fn| (CAR |x|)) (|form2HtString,fnTailTail| (CDR |x|)) (ELT |str| 1))))) -(DEFUN |form2HtString,fn| (|x|) +(defun |form2HtString,fn| (|x|) (PROG (|u| |tail| |head|) (declare (special |$emList|)) (RETURN @@ -13593,7 +13593,7 @@ $dbKindAlist := (SPADLET |head| (|form2HtString,fn| (CAR |x|))) (EXIT (STRCONC |head| |tail|)))))) -(DEFUN |form2HtString| (&REST G176659 &AUX |options| |x|) +(defun |form2HtString| (&REST G176659 &AUX |options| |x|) (DSETQ (|x| . |options|) G176659) (PROG (|$emList| |$brief|) (DECLARE (SPECIAL |$emList| |$brief|)) @@ -13613,7 +13613,7 @@ $dbKindAlist := ; STRCONC('" ",fn r) ; STRCONC(sexpr2HtString first x,suffix) -(DEFUN |sexpr2HtString,fn| (|x|) +(defun |sexpr2HtString,fn| (|x|) (PROG (|r| |suffix|) (RETURN (SEQ (SPADLET |r| (CDR |x|)) @@ -13626,7 +13626,7 @@ $dbKindAlist := (|sexpr2HtString,fn| |r|))))) (EXIT (STRCONC (|sexpr2HtString| (CAR |x|)) |suffix|)))))) -(DEFUN |sexpr2HtString| (|x|) +(defun |sexpr2HtString| (|x|) (COND ((ATOM |x|) (|form2HtString| |x|)) ('T @@ -13646,7 +13646,7 @@ $dbKindAlist := ; STRCONC(args2LispString rest r,'"->",form2LispString first r) ; STRCONC(form2LispString first x,args2LispString rest x) -(DEFUN |form2LispString| (|x|) +(defun |form2LispString| (|x|) (PROG (|ISTMP#1| |a| |ISTMP#2| |b| |r|) (RETURN (COND @@ -13697,7 +13697,7 @@ $dbKindAlist := ; STRCONC('" ",fn r) ; STRCONC(sexpr2HtString first x,suffix) -(DEFUN |sexpr2LispString,fn| (|x|) +(defun |sexpr2LispString,fn| (|x|) (PROG (|r| |suffix|) (RETURN (SEQ (SPADLET |r| (CDR |x|)) @@ -13710,7 +13710,7 @@ $dbKindAlist := (|sexpr2LispString,fn| |r|))))) (EXIT (STRCONC (|sexpr2HtString| (CAR |x|)) |suffix|)))))) -(DEFUN |sexpr2LispString| (|x|) +(defun |sexpr2LispString| (|x|) (COND ((ATOM |x|) (|form2LispString| |x|)) ('T @@ -13724,12 +13724,12 @@ $dbKindAlist := ; null x => '"" ; STRCONC('",",form2LispString first x,fnTailTail rest x) -(DEFUN |args2LispString,fnTailTail| (|x|) +(defun |args2LispString,fnTailTail| (|x|) (SEQ (IF (NULL |x|) (EXIT "")) (EXIT (STRCONC "," (|form2LispString| (CAR |x|)) (|args2LispString,fnTailTail| (CDR |x|)))))) -(DEFUN |args2LispString| (|x|) +(defun |args2LispString| (|x|) (COND ((NULL |x|) "") ('T @@ -13744,7 +13744,7 @@ $dbKindAlist := ; HGET($defaultPackageNamesHT,x) => 'default_ package ; 'domain -(DEFUN |dbConstructorKind| (|x|) +(defun |dbConstructorKind| (|x|) (PROG (|target| |ISTMP#1|) (declare (special |$defaultPackageNamesHT|)) (RETURN @@ -13770,7 +13770,7 @@ $dbKindAlist := ; name = 'Enumeration => '(Enumeration a b) ; GETDATABASE(name,'CONSTRUCTORFORM) -(DEFUN |getConstructorForm| (|name|) +(defun |getConstructorForm| (|name|) (COND ((BOOT-EQUAL |name| '|Union|) '(|Union| (|:| |a| A) (|:| |b| B))) ((BOOT-EQUAL |name| '|UntaggedUnion|) '(|Union| A B)) @@ -13781,7 +13781,7 @@ $dbKindAlist := ;getConstructorArgs conname == CDR getConstructorForm conname -(DEFUN |getConstructorArgs| (|conname|) +(defun |getConstructorArgs| (|conname|) (CDR (|getConstructorForm| |conname|))) ;htSay(x,:options) == @@ -13790,7 +13790,7 @@ $dbKindAlist := ; bcHt x ; for y in options repeat bcHt y -(DEFUN |htSay| (&REST G176754 &AUX |options| |x|) +(defun |htSay| (&REST G176754 &AUX |options| |x|) (DSETQ (|x| . |options|) G176754) (SEQ (PROGN (|bcHt| |x|) @@ -13815,7 +13815,7 @@ $dbKindAlist := ; for x in rest comments repeat htSay('" ",x) ; if italics? then htSay '"}" -(DEFUN |bcComments| (&REST G176770 &AUX |options| |comments|) +(defun |bcComments| (&REST G176770 &AUX |options| |comments|) (DSETQ (|comments| . |options|) G176770) (PROG (|italics?|) (RETURN @@ -13850,7 +13850,7 @@ $dbKindAlist := ; $italicHead? : local := IFCAR IFCDR options ; bcConform1 form -(DEFUN |bcConform| (&REST G176781 &AUX |options| |form|) +(defun |bcConform| (&REST G176781 &AUX |options| |form|) (DSETQ (|form| . |options|) G176781) (PROG (|$italics?| |$italicHead?|) (DECLARE (SPECIAL |$italics?| |$italicHead?|)) @@ -13863,7 +13863,7 @@ $dbKindAlist := ;bcConstructor(form is [op,:arglist],cname) == --called only when $conformsAreDomains ; htSayList dbConformGen form -(DEFUN |bcConstructor| (|form| |cname|) +(defun |bcConstructor| (|form| |cname|) (declare (ignore |cname|)) (PROG (|op| |arglist|) (RETURN @@ -13875,7 +13875,7 @@ $dbKindAlist := ;htSayList u == ; for x in u repeat htSay x -(DEFUN |htSayList| (|u|) +(defun |htSayList| (|u|) (SEQ (DO ((G176798 |u| (CDR G176798)) (|x| NIL)) ((OR (ATOM G176798) (PROGN (SETQ |x| (CAR G176798)) NIL)) @@ -13886,7 +13886,7 @@ $dbKindAlist := ; for u in form2String form repeat ; htSay u -(DEFUN |conform2HtString| (|form|) +(defun |conform2HtString| (|form|) (SEQ (DO ((G176810 (|form2String| |form|) (CDR G176810)) (|u| NIL)) ((OR (ATOM G176810) @@ -13904,7 +13904,7 @@ $dbKindAlist := ; INTEGERP form => true ; false -(DEFUN |dbEvalableConstructor?| (|form|) +(defun |dbEvalableConstructor?| (|form|) (PROG (|op| |argl|) (RETURN (SEQ (COND @@ -13933,7 +13933,7 @@ $dbKindAlist := ;htSayItalics s == htSay('"{\em ",s,'"}") -(DEFUN |htSayItalics| (|s|) +(defun |htSayItalics| (|s|) (|htSay| "{\\em " |s| "}")) ;bcCon(name,:options) == @@ -13943,7 +13943,7 @@ $dbKindAlist := ; htSayConstructorName(s,s) ; htSay argString -(DEFUN |bcCon| (&REST G176853 &AUX |options| |name|) +(defun |bcCon| (&REST G176853 &AUX |options| |name|) (DSETQ (|name| . |options|) G176853) (PROG (|argString| |s|) (RETURN @@ -13960,7 +13960,7 @@ $dbKindAlist := ; bcStar name ; htSayConstructorName(a,s) -(DEFUN |bcAbb| (|name| |abb|) +(defun |bcAbb| (|name| |abb|) (PROG (|s| |a|) (RETURN (PROGN @@ -13972,7 +13972,7 @@ $dbKindAlist := ;bcStar name == ; if $includeUnexposed? and not isExposedConstructor name then htSayUnexposed() -(DEFUN |bcStar| (|name|) +(defun |bcStar| (|name|) (declare (special |$includeUnexposed?|)) (COND ((AND |$includeUnexposed?| (NULL (|isExposedConstructor| |name|))) @@ -13984,7 +13984,7 @@ $dbKindAlist := ; not isExposedConstructor name => htSayUnexposed() ; htBlank() -(DEFUN |bcStarSpace| (|name|) +(defun |bcStarSpace| (|name|) (declare (special |$includeUnexposed?|)) (COND ((NULL |$includeUnexposed?|) NIL) @@ -13998,7 +13998,7 @@ $dbKindAlist := ; if op.0 = char '_* then htSay '" " ; htBlank() -(DEFUN |bcStarSpaceOp| (|op| |exposed?|) +(defun |bcStarSpaceOp| (|op| |exposed?|) (declare (special |$includeUnexposed?|)) (COND ((NULL |$includeUnexposed?|) NIL) @@ -14013,7 +14013,7 @@ $dbKindAlist := ; bcStar opOf form ; bcConform form -(DEFUN |bcStarConform| (|form|) +(defun |bcStarConform| (|form|) (PROGN (|bcStar| (|opOf| |form|)) (|bcConform| |form|))) ;dbSourceFile name == @@ -14023,7 +14023,7 @@ $dbKindAlist := ; t := PATHNAME_-TYPE u ; STRCONC(n,'".",t) -(DEFUN |dbSourceFile| (|name|) +(defun |dbSourceFile| (|name|) (PROG (|u| |n| |t|) (RETURN (PROGN @@ -14040,14 +14040,14 @@ $dbKindAlist := ; k = m => SUBSTRING(s,i,nil) ; fn(s,k + 1,m) -(DEFUN |extractFileNameFromPath,fn| (|s| |i| |m|) +(defun |extractFileNameFromPath,fn| (|s| |i| |m|) (PROG (|k|) (RETURN (SEQ (SPADLET |k| (|charPosition| (|char| '/) |s| |i|)) (IF (BOOT-EQUAL |k| |m|) (EXIT (SUBSTRING |s| |i| NIL))) - (EXIT (|extractFileNameFromPath,fn| |s| (PLUS |k| 1) |m|)))))) + (EXIT (|extractFileNameFromPath,fn| |s| (+ |k| 1) |m|)))))) -(DEFUN |extractFileNameFromPath| (|s|) +(defun |extractFileNameFromPath| (|s|) (|extractFileNameFromPath,fn| |s| 0 (|#| |s|))) ;bcOpTable(u,fn) == @@ -14061,7 +14061,7 @@ $dbKindAlist := ; htSay '"}" ; htEndTable() -(DEFUN |bcOpTable| (|u| |fn|) +(defun |bcOpTable| (|u| |fn|) (PROG (|firstTime|) (RETURN (SEQ (PROGN @@ -14094,7 +14094,7 @@ $dbKindAlist := ; $bcMultipleNames: local := (#u ^= 1) ; bcConTable REMDUP u -(DEFUN |bcNameConTable| (|u|) +(defun |bcNameConTable| (|u|) (PROG (|$bcMultipleNames|) (DECLARE (SPECIAL |$bcMultipleNames|)) (RETURN @@ -14115,7 +14115,7 @@ $dbKindAlist := ; htSay '"}" ; htEndTable() -(DEFUN |bcConTable| (|u|) +(defun |bcConTable| (|u|) (PROG (|firstTime|) (RETURN (SEQ (PROGN @@ -14148,7 +14148,7 @@ $dbKindAlist := ; htSay '"}" ; htEndTable() -(DEFUN |bcAbbTable| (|u|) +(defun |bcAbbTable| (|u|) (PROG (|firstTime| |con| |ISTMP#1| |abb|) (RETURN (SEQ (PROGN @@ -14198,7 +14198,7 @@ $dbKindAlist := ; htSay '"}" ; htEndTable() -(DEFUN |bcConPredTable| (&REST G177055 &AUX |options| |conname| |u|) +(defun |bcConPredTable| (&REST G177055 &AUX |options| |conname| |u|) (DSETQ (|u| |conname| . |options|) G177055) (PROG (|italicList| |conform| |firstTime| |form| |ISTMP#1| |arglist| |pred|) @@ -14256,7 +14256,7 @@ $dbKindAlist := ; if not IFCAR IFCDR options then htSay '" {\em if} " ; htPred2English(pred,italicList) -(DEFUN |bcPred| (&REST G177061 &AUX |options| |pred|) +(defun |bcPred| (&REST G177061 &AUX |options| |pred|) (DSETQ (|pred| . |options|) G177061) (PROG (|italicList|) (RETURN @@ -14279,7 +14279,7 @@ $dbKindAlist := ; nil ; [rest x,:simpBool SUBST('T,x,pred)] -(DEFUN |extractHasArgs,find| (|x|) +(defun |extractHasArgs,find| (|x|) (PROG (|op| |argl|) (RETURN (SEQ (IF (AND (CONSP |x|) @@ -14312,7 +14312,7 @@ $dbKindAlist := (EXIT NIL)))) (EXIT NIL))))) -(DEFUN |extractHasArgs| (|pred|) +(defun |extractHasArgs| (|pred|) (PROG (|x|) (RETURN (PROGN @@ -14327,7 +14327,7 @@ $dbKindAlist := ; cond := [pair,:cond] ; [NREVERSE uncond,:NREVERSE cond] -(DEFUN |splitConTable| (CONS) +(defun |splitConTable| (CONS) (PROG (|con| |pred| |uncond| |cond|) (RETURN (SEQ (PROGN @@ -14364,7 +14364,7 @@ $dbKindAlist := ; htSay '"}" ; htEndTable() -(DEFUN |bcNameTable| (&REST G177140 &AUX |option| |fn| |u|) +(defun |bcNameTable| (&REST G177140 &AUX |option| |fn| |u|) (DSETQ (|u| |fn| . |option|) G177140) (PROG (|firstTime| |s|) (RETURN @@ -14411,7 +14411,7 @@ $dbKindAlist := ; htSay '"}" ; htEndTable() -(DEFUN |bcNameCountTable| +(defun |bcNameCountTable| (&REST G177164 &AUX |options| |gn| |fn| |u|) (DSETQ (|u| |fn| |gn| . |options|) G177164) (PROG (|linkFunction| |firstTime|) @@ -14450,7 +14450,7 @@ $dbKindAlist := ; APPLY(function dbSayItems,u) ; htSay '"}" -(DEFUN |dbSayItemsItalics| (&REST G177169 &AUX |u|) +(defun |dbSayItemsItalics| (&REST G177169 &AUX |u|) (DSETQ |u| G177169) (PROGN (|htSay| "{\\em ") @@ -14470,7 +14470,7 @@ $dbKindAlist := ; for x in options repeat bcHt x ; if count ^= 0 then bcHt '":" -(DEFUN |dbSayItems| +(defun |dbSayItems| (&REST G177193 &AUX |options| |plural| |singular| |countOrPrefix|) (DSETQ (|countOrPrefix| |singular| |plural| . |options|) G177193) @@ -14511,7 +14511,7 @@ $dbKindAlist := ;dbBasicConstructor? conname == MEMBER(dbSourceFile conname,'("catdef" "coerce")) -(DEFUN |dbBasicConstructor?| (|conname|) +(defun |dbBasicConstructor?| (|conname|) (|member| (|dbSourceFile| |conname|) '("catdef" "coerce"))) ;nothingFoundPage(:options) == @@ -14520,7 +14520,7 @@ $dbKindAlist := ;htCopyProplist htPage == [[x,:y] for [x,:y] in htpPropertyList htPage] -(DEFUN |htCopyProplist| (|htPage|) +(defun |htCopyProplist| (|htPage|) (PROG (|x| |y|) (RETURN (SEQ (PROG (G177211) @@ -14547,7 +14547,7 @@ $dbKindAlist := ; loadLibIfNotLoaded(name) ; u := GET(name,'infovec) => u -(DEFUN |dbInfovec| (|name|) +(defun |dbInfovec| (|name|) (PROG (|u|) (RETURN (COND @@ -14568,7 +14568,7 @@ $dbKindAlist := ; htSay '"}}" ; htShowPage() -(DEFUN |emptySearchPage| +(defun |emptySearchPage| (&REST G177243 &AUX |options| |filter| |kind|) (DSETQ (|kind| |filter| . |options|) G177243) (PROG (|skipNamePart| |heading| |exposePart|) @@ -14595,14 +14595,14 @@ $dbKindAlist := ;isLoaded? conform == GET(constructor? opOf conform,'LOADED) -(DEFUN |isLoaded?| (|conform|) +(defun |isLoaded?| (|conform|) (GETL (|constructor?| (|opOf| |conform|)) 'LOADED)) ;string2Integer s == ; and/[DIGIT_-CHAR_-P (s.i) for i in 0..MAXINDEX s] => PARSE_-INTEGER s ; nil -(DEFUN |string2Integer| (|s|) +(defun |string2Integer| (|s|) (PROG () (RETURN (SEQ (COND @@ -14624,7 +14624,7 @@ $dbKindAlist := ; null s or s = '"" => '"*" ; s -(DEFUN |dbGetInputString| (|htPage|) +(defun |dbGetInputString| (|htPage|) (PROG (|s|) (RETURN (PROGN @@ -14645,7 +14645,7 @@ $dbKindAlist := ; htShowPage() ; systemError '"Unexpected error message" -(DEFUN |bcErrorPage| (|u|) +(defun |bcErrorPage| (|u|) (PROG (|r|) (RETURN (SEQ (COND @@ -14669,7 +14669,7 @@ $dbKindAlist := ; for x in info repeat htSay x ; htShowPage() -(DEFUN |errorPage| (|htPage| G177285) +(defun |errorPage| (|htPage| G177285) (declare (special |htPage|)) (PROG (|heading| |kind| |info|) (RETURN @@ -14696,7 +14696,7 @@ $dbKindAlist := ;htErrorStar() == ; errorPage(nil,['"{\em *} not a valid search string",nil,'"\vspace{3}\centerline{{\em *} is not a valid search string for a general search}\centerline{\em {it would match everything!}}"]) -(DEFUN |htErrorStar| () +(defun |htErrorStar| () (|errorPage| NIL (CONS "{\\em *} not a valid search string" (CONS NIL @@ -14709,7 +14709,7 @@ $dbKindAlist := ; htQuery(query,fn) ; htShowPage() -(DEFUN |htQueryPage| (|htPage| |heading| |message| |query| |fn|) +(defun |htQueryPage| (|htPage| |heading| |message| |query| |fn|) (declare (special |htPage|)) (PROGN (|htInitPage| |heading| NIL) @@ -14731,7 +14731,7 @@ $dbKindAlist := ; else htMakePage [['bcLispLinks,['"\fbox{No}",'"",fn,'no]]] ; htSay('"}") -(DEFUN |htQuery| (&REST G177324 &AUX |options| |fn| |question|) +(defun |htQuery| (&REST G177324 &AUX |options| |fn| |question|) (DSETQ (|question| |fn| . |options|) G177324) (PROG (|upLink?|) (RETURN @@ -14769,7 +14769,7 @@ $dbKindAlist := ; htSay(form2HtString form,'"}}") ; htShowPage() -(DEFUN |kInvalidTypePage| (|form|) +(defun |kInvalidTypePage| (|form|) (PROGN (|htInitPage| "Error" NIL) (|bcBlankLine|) @@ -14783,7 +14783,7 @@ $dbKindAlist := ; htSay(IFCAR options or '"\centerline{This page is not available yet}") ; htShowPage() -(DEFUN |dbNotAvailablePage| (&REST G177333 &AUX |options|) +(defun |dbNotAvailablePage| (&REST G177333 &AUX |options|) (DSETQ |options| G177333) (PROGN (|htInitPage| "Missing Page" NIL) @@ -14797,18 +14797,18 @@ $dbKindAlist := ;--======================================================================= ;dbpHasDefaultCategory? s == #s > 1 and s.1 = char 'x --s is part 3 of line -(DEFUN |dbpHasDefaultCategory?| (|s|) +(defun |dbpHasDefaultCategory?| (|s|) (AND (> (|#| |s|) 1) (BOOT-EQUAL (ELT |s| 1) (|char| '|x|)))) ;dbKindString kind == LASSOC(kind,$dbKindAlist) -(DEFUN |dbKindString| (|kind|) +(defun |dbKindString| (|kind|) (declare (special |$dbKindAlist|)) (LASSOC |kind| |$dbKindAlist|)) ;dbName line == escapeString SUBSTRING(line,1,charPosition($tick,line,1) - 1) -(DEFUN |dbName| (|line|) +(defun |dbName| (|line|) (declare (special |$tick|)) (|escapeString| (SUBSTRING |line| 1 @@ -14816,31 +14816,31 @@ $dbKindAlist := ;dbAttr line == STRCONC(dbName line,escapeString dbPart(line,4,0)) -(DEFUN |dbAttr| (|line|) +(defun |dbAttr| (|line|) (STRCONC (|dbName| |line|) (|escapeString| (|dbPart| |line| 4 0)))) ;dbPart(line,n,k) == --returns part n of line (n=1,..) beginning in column k ; n = 1 => SUBSTRING(line,k + 1,charPosition($tick,line,k + 1) - k - 1) ; dbPart(line,n - 1,charPosition($tick,line,k + 1)) -(DEFUN |dbPart| (|line| |n| |k|) +(defun |dbPart| (|line| |n| |k|) (declare (special |$tick|)) (COND ((EQL |n| 1) - (SUBSTRING |line| (PLUS |k| 1) + (SUBSTRING |line| (+ |k| 1) (SPADDIFFERENCE (SPADDIFFERENCE - (|charPosition| |$tick| |line| (PLUS |k| 1)) |k|) + (|charPosition| |$tick| |line| (+ |k| 1)) |k|) 1))) ('T (|dbPart| |line| (SPADDIFFERENCE |n| 1) - (|charPosition| |$tick| |line| (PLUS |k| 1)))))) + (|charPosition| |$tick| |line| (+ |k| 1)))))) ;dbXParts(line,n,m) == ; [.,nargs,:r] := dbParts(line,n,m) ; [dbKindString line.0,dbName line,PARSE_-INTEGER nargs,:r] -(DEFUN |dbXParts| (|line| |n| |m|) +(defun |dbXParts| (|line| |n| |m|) (PROG (|LETTMP#1| |nargs| |r|) (RETURN (PROGN @@ -14856,7 +14856,7 @@ $dbKindAlist := ; [SUBSTRING(line,m,-m + (k := charPosition($tick,line,m))), ; :dbParts(line,n - 1,k + 1)] -(DEFUN |dbParts| (|line| |n| |m|) +(defun |dbParts| (|line| |n| |m|) (PROG (|k|) (declare (special |$tick|)) (RETURN @@ -14864,18 +14864,18 @@ $dbKindAlist := ((EQL |n| 0) NIL) ('T (CONS (SUBSTRING |line| |m| - (PLUS (SPADDIFFERENCE |m|) + (+ (SPADDIFFERENCE |m|) (SPADLET |k| (|charPosition| |$tick| |line| |m|)))) - (|dbParts| |line| (SPADDIFFERENCE |n| 1) (PLUS |k| 1)))))))) + (|dbParts| |line| (SPADDIFFERENCE |n| 1) (+ |k| 1)))))))) ;dbConname(line) == dbPart(line,5,1) -(DEFUN |dbConname| (|line|) (|dbPart| |line| 5 1)) +(defun |dbConname| (|line|) (|dbPart| |line| 5 1)) ;dbComments line == dbReadComments(string2Integer dbPart(line,7,1)) -(DEFUN |dbComments| (|line|) +(defun |dbComments| (|line|) (|dbReadComments| (|string2Integer| (|dbPart| |line| 7 1)))) ;dbNewConname(line) == --dbName line unless kind is 'a or 'o => name in 5th pos. @@ -14885,7 +14885,7 @@ $dbKindAlist := ; SUBSTRING(conform,1,k - 1) ; dbName line -(DEFUN |dbNewConname| (|line|) +(defun |dbNewConname| (|line|) (PROG (|kind| |conform| |k|) (RETURN (COND @@ -14900,17 +14900,17 @@ $dbKindAlist := ; n = 1 => charPosition($tick,line,k) ; dbTickIndex(line,n - 1,1 + charPosition($tick,line,k)) -(DEFUN |dbTickIndex| (|line| |n| |k|) +(defun |dbTickIndex| (|line| |n| |k|) (declare (special |$tick|)) (COND ((EQL |n| 1) (|charPosition| |$tick| |line| |k|)) ('T (|dbTickIndex| |line| (SPADDIFFERENCE |n| 1) - (PLUS 1 (|charPosition| |$tick| |line| |k|)))))) + (+ 1 (|charPosition| |$tick| |line| |k|)))))) ;mySort u == listSort(function GLESSEQP,u) -(DEFUN |mySort| (|u|) (|listSort| #'GLESSEQP |u|)) +(defun |mySort| (|u|) (|listSort| #'GLESSEQP |u|)) ;--====================> WAS b-prof.boot <================================ ;--============================================================================ @@ -14930,7 +14930,7 @@ $dbKindAlist := ; opAlist := kciReduceOpAlist(htpProperty(page,'opAlist),infoAlist) ; dbShowOperationsFromConform(page,which,opAlist) -(DEFUN |kciPage| (|htPage| |junk|) +(defun |kciPage| (|htPage| |junk|) (declare (ignore |junk|)) (PROG (|which| |domname| |conform| |heading| |page| |conname| |infoAlist| |opAlist|) @@ -14964,7 +14964,7 @@ $dbKindAlist := ; nil ; res -(DEFUN |kciReduceOpAlist| (|opAlist| |infoAlist|) +(defun |kciReduceOpAlist| (|opAlist| |infoAlist|) (PROG (|op| |items| |u| |sig| |sig1| |y| |res|) (RETURN (SEQ (PROGN @@ -15174,7 +15174,7 @@ $dbKindAlist := ; dbShowInfoOp(htPage,op,sig,itemlist) ; nil -(DEFUN |displayInfoOp| (|htPage| |infoAlist| |op| |sig|) +(defun |displayInfoOp| (|htPage| |infoAlist| |op| |sig|) (PROG (|sigAlist| |itemlist|) (RETURN (COND @@ -15256,7 +15256,7 @@ $dbKindAlist := ; bincount := bincount + 1 ; htSay '"\endmenu " -(DEFUN |dbShowInfoOp| (|htPage| |op| |sig| |alist|) +(defun |dbShowInfoOp| (|htPage| |op| |sig| |alist|) (PROG (|domname| |opAlist| |kind| |honestConform| |faTypes| |conArgTypes| |conform| |conname| |ops| |oppart| |head| |heading| |locals| |arguments| |x| |y| |dollar| |rep| @@ -15483,7 +15483,7 @@ $dbKindAlist := (|htSay| ":\\newline ") (|dbShowInfoList| |fns| (TIMES |bincount| 8192) |buttonForOp|) - (SPADLET |bincount| (PLUS |bincount| 1)))))) + (SPADLET |bincount| (+ |bincount| 1)))))) (|htSay| "\\endmenu ")))))) ;dbShowInfoList(dataItems,count,buttonForOp?) == @@ -15512,7 +15512,7 @@ $dbKindAlist := ; htSay '"} " ; count -(DEFUN |dbShowInfoList| (|dataItems| |count| |buttonForOp?|) +(defun |dbShowInfoList| (|dataItems| |count| |buttonForOp?|) (PROG (|single?| |ISTMP#1| |ISTMP#2| |s| |LETTMP#1| |op| |sig| |ops|) (RETURN (SEQ (PROGN @@ -15574,7 +15574,7 @@ $dbKindAlist := ((ATOM |sig|) (|htSay| |sig|)) ('T (|bcConform| (|dbInfoSig| |sig|)))))) (|htSay| "}") - (SPADLET |count| (PLUS |count| 1)))))) + (SPADLET |count| (+ |count| 1)))))) (|htSay| "} ") |count|))))) @@ -15584,7 +15584,7 @@ $dbKindAlist := ; t := conArgTypes . n ; [argName,:[dbInfoWrapOrigin(x,t) for x in opSigList]] -(DEFUN |dbInfoFindCat| (|conform| |conArgTypes| |u|) +(defun |dbInfoFindCat| (|conform| |conArgTypes| |u|) (PROG (|argName| |opSigList| |n| |t|) (RETURN (SEQ (PROGN @@ -15612,7 +15612,7 @@ $dbKindAlist := ; origin := dbInfoOrigin(op,sig,t) => ['origin, origin, x] ; x -(DEFUN |dbInfoWrapOrigin| (|x| |t|) +(defun |dbInfoWrapOrigin| (|x| |t|) (PROG (|op| |sig| |origin|) (RETURN (PROGN @@ -15629,7 +15629,7 @@ $dbKindAlist := ; [sig = sig1 for [sig1,:.] in LASSOC(op, koOps(t,nil))] => t ; false -(DEFUN |dbInfoOrigin| (|op| |sig| |t|) +(defun |dbInfoOrigin| (|op| |sig| |t|) (PROG (|r| |sig1|) (RETURN (SEQ (COND @@ -15671,12 +15671,12 @@ $dbKindAlist := ;dbInfoTran(con,opSigList) == [con,:SUBST("$",con,mySort opSigList)] -(DEFUN |dbInfoTran| (|con| |opSigList|) +(defun |dbInfoTran| (|con| |opSigList|) (CONS |con| (MSUBST '$ |con| (|mySort| |opSigList|)))) ;zeroOneConvertAlist u == [[zeroOneConvert x,:y] for [x,:y] in u] -(DEFUN |zeroOneConvertAlist| (|u|) +(defun |zeroOneConvertAlist| (|u|) (PROG (|x| |y|) (RETURN (SEQ (PROG (G177870) @@ -15703,7 +15703,7 @@ $dbKindAlist := ; [con, :alist] := fromAlist.index ; dbInfoChoose1(htPage,con,alist) -(DEFUN |dbInfoChoose| (|htPage| |count|) +(defun |dbInfoChoose| (|htPage| |count|) (PROG (|fromAlist| |index| |LETTMP#1| |con| |alist|) (RETURN (PROGN @@ -15726,7 +15726,7 @@ $dbKindAlist := ; [item] ; dbInfoChoose1(htPage,con,alist) -(DEFUN |dbInfoChooseSingle| (|htPage| |count|) +(defun |dbInfoChooseSingle| (|htPage| |count|) (PROG (|fromAlist| |index| |binkey| |LETTMP#1| |item| |ISTMP#1| |origin| |ISTMP#2| |s| |con| |alist|) (RETURN @@ -15766,7 +15766,7 @@ $dbKindAlist := ; htpSetProperty(page,'kind,PNAME GETDATABASE(opOf con,'CONSTRUCTORKIND)) ; dbShowOperationsFromConform(page,'"operation",opAlist) -(DEFUN |dbInfoChoose1| (|htPage| |con| |alist|) +(defun |dbInfoChoose1| (|htPage| |con| |alist|) (declare (ignore |htPage|)) (PROG (|$conform| |pair| |opAlist| |page|) (DECLARE (SPECIAL |$conform|)) @@ -15805,7 +15805,7 @@ $dbKindAlist := ; (s2 := SUBST($conform,"$",s)) and "or"/[first s2 = s1 for s1 in candidates]] ; sigs and [op,:sigs] -(DEFUN |dbInfoSigMatch| (|x| |alist|) +(defun |dbInfoSigMatch| (|x| |alist|) (PROG (|op| |sigAlist| |op1| |sig| |candidates| |s2| |sigs|) (declare (special |$conform|)) (RETURN @@ -15905,7 +15905,7 @@ $dbKindAlist := ; null rest sig => first sig ; ['Mapping,:sig] -(DEFUN |dbInfoSig| (|sig|) +(defun |dbInfoSig| (|sig|) (COND ((NULL (CDR |sig|)) (CAR |sig|)) ('T (CONS '|Mapping| |sig|)))) ;--============================================================================ @@ -15920,7 +15920,7 @@ $dbKindAlist := ; dbExpandOpAlistIfNecessary(htPage,opAlist,'"operation",false,false) ; htpProperty(htPage,'opAlist) -(DEFUN |dbGetExpandedOpAlist| (|htPage|) +(defun |dbGetExpandedOpAlist| (|htPage|) (PROG (|expand| |opAlist|) (RETURN (PROGN @@ -15943,7 +15943,7 @@ $dbKindAlist := ;hasNewInfoAlist conname == ; (u := getInfoAlist conname) and hasNewInfoText u -(DEFUN |hasNewInfoAlist| (|conname|) +(defun |hasNewInfoAlist| (|conname|) (PROG (|u|) (RETURN (AND (SPADLET |u| (|getInfoAlist| |conname|)) @@ -15953,7 +15953,7 @@ $dbKindAlist := ; and/[ATOM op and and/[item is [sig,:alist] and ; null sig or null atom sig and null atom alist for item in items] for [op,:items] in u] -(DEFUN |hasNewInfoText| (|u|) +(defun |hasNewInfoText| (|u|) (PROG (|op| |items| |sig| |alist|) (RETURN (SEQ (PROG (G178092) @@ -16023,7 +16023,7 @@ $dbKindAlist := ; alist := SUBST("$",dollarName,alist) ; alist -(DEFUN |getInfoAlist| (|conname|) +(defun |getInfoAlist| (|conname|) (PROG (|cat?| |abb| |fs| |filename| |inStream| |LETTMP#1| |dollarName| |alist|) (RETURN @@ -16125,7 +16125,7 @@ $dbKindAlist := ; $saturn := true ; $standard := false -(DEFUN |on| () +(defun |on| () (declare (special |$saturn| |$standard|)) (PROGN (SPADLET |$saturn| 'T) (SPADLET |$standard| NIL))) @@ -16133,7 +16133,7 @@ $dbKindAlist := ; $saturn := false ; $standard := true -(DEFUN |off| () +(defun |off| () (declare (special |$saturn| |$standard|)) (PROGN (SPADLET |$saturn| NIL) (SPADLET |$standard| 'T))) @@ -16173,7 +16173,7 @@ $dbKindAlist := ; $standard := false ; saturnEvalToFile(command, '"/tmp/sat.text") -(DEFUN |ts| (|command|) +(defun |ts| (|command|) (declare (special |$saturn| |$saturnFileNumber| |$standard|)) (PROGN (SPADLET |$saturn| 'T) @@ -16186,7 +16186,7 @@ $dbKindAlist := ; $standard := true ; 'done -(DEFUN |ut| () +(defun |ut| () (declare (special |$saturn| |$standard|)) (PROGN (SPADLET |$saturn| NIL) (SPADLET |$standard| 'T) '|done|)) @@ -16194,7 +16194,7 @@ $dbKindAlist := ; $saturnFileNumber := 1 ; obey '"dosdir" -(DEFUN |onDisk| () +(defun |onDisk| () (declare (special |$saturnFileNumber|)) (PROGN (SPADLET |$saturnFileNumber| 1) @@ -16203,7 +16203,7 @@ $dbKindAlist := ;offDisk() == ; $saturnFileNumber := false -(DEFUN |offDisk| () +(defun |offDisk| () (declare (special |$saturnFileNumber|)) (SPADLET |$saturnFileNumber| NIL)) @@ -16211,7 +16211,7 @@ $dbKindAlist := ; $standard => $curPage ; $saturnPage -(DEFUN |page| () +(defun |page| () (declare (special |$standard| |$curPage| |$saturnPage|)) (COND (|$standard| |$curPage|) ('T |$saturnPage|))) @@ -16223,7 +16223,7 @@ $dbKindAlist := ; htSay x ; htSay '"}" -(DEFUN |htSayCold| (|x|) +(defun |htSayCold| (|x|) (PROGN (|htSay| "\\lispLink{}{") (|htSay| |x|) @@ -16232,7 +16232,7 @@ $dbKindAlist := ;htSayIfStandard(x, :options) == --do only for $standard ; $standard => htSayBind(x,options) -(DEFUN |htSayIfStandard| (&REST G178203 &AUX |options| |x|) +(defun |htSayIfStandard| (&REST G178203 &AUX |options| |x|) (declare (special |$standard|)) (DSETQ (|x| . |options|) G178203) (SEQ (COND (|$standard| (EXIT (|htSayBind| |x| |options|)))))) @@ -16241,7 +16241,7 @@ $dbKindAlist := ; $saturn: local := nil ; htSayBind(x, options) -(DEFUN |htSayStandard| (&REST G178211 &AUX |options| |x|) +(defun |htSayStandard| (&REST G178211 &AUX |options| |x|) (DSETQ (|x| . |options|) G178211) (PROG (|$saturn|) (DECLARE (SPECIAL |$saturn|)) @@ -16252,7 +16252,7 @@ $dbKindAlist := ; $standard: local := nil ; htSayBind(x, options) -(DEFUN |htSaySaturn| (&REST G178219 &AUX |options| |x|) +(defun |htSaySaturn| (&REST G178219 &AUX |options| |x|) (DSETQ (|x| . |options|) G178219) (PROG (|$standard|) (DECLARE (SPECIAL |$standard|)) @@ -16263,7 +16263,7 @@ $dbKindAlist := ; bcHt x ; for y in options repeat bcHt y -(DEFUN |htSayBind| (|x| |options|) +(defun |htSayBind| (|x| |options|) (SEQ (PROGN (|bcHt| |x|) (DO ((G178224 |options| (CDR G178224)) (|y| NIL)) @@ -16285,7 +16285,7 @@ $dbKindAlist := ; $htLineList := NCONC(nreverse mapStringize COPY_-LIST line, $htLineList) ; $htLineList := [basicStringize line, :$htLineList] -(DEFUN |bcHt| (|line|) +(defun |bcHt| (|line|) (PROG (|text|) (declare (special |$newPage| |$htLineList| |$saturnPage| |$curPage| |$standard| |$saturn|)) @@ -16322,7 +16322,7 @@ $dbKindAlist := ; htSayStandard '"\endscroll" ; htShowPageNoScroll() -(DEFUN |htShowPage| () +(defun |htShowPage| () (PROGN (|htSayStandard| "\\endscroll") (|htShowPageNoScroll|))) @@ -16351,7 +16351,7 @@ $dbKindAlist := ; ---------------------- ; endHTPage() -(DEFUN |htShowPageNoScroll| () +(defun |htShowPageNoScroll| () (PROG (|line|) (declare (special |$newPage| |$curPage| |$saturnPage| |$htLineList| |$saturn| |$standard|)) @@ -16401,7 +16401,7 @@ $dbKindAlist := ; obey STRCONC('"doswrite -a saturn.tex ",fn, '".tex") ; $saturnFileNumber := $saturnFileNumber + 1 -(DEFUN |issueHTSaturn| (|line|) +(defun |issueHTSaturn| (|line|) (PROG (|$marg| |$linelength| |fn|) (DECLARE (SPECIAL |$marg| |$linelength| |$saturnFileNumber| |$saturn|)) (RETURN @@ -16420,7 +16420,7 @@ $dbKindAlist := (|obey| (STRCONC "doswrite -a saturn.tex " |fn| ".tex")) (SPADLET |$saturnFileNumber| - (PLUS |$saturnFileNumber| 1))) + (+ |$saturnFileNumber| 1))) ('T NIL))) ('T NIL))))) @@ -16433,7 +16433,7 @@ $dbKindAlist := ; '"}{",:nreverse $saturnContextMenuLines, ; '"}\usemenu{BCM", index,'"}{\vbox{"] -(DEFUN |writeSaturnPrefix| () +(defun |writeSaturnPrefix| () (PROG (|index|) (declare (special |$saturnContextMenuLines| |$saturnContextMenuIndex|)) (RETURN @@ -16444,7 +16444,7 @@ $dbKindAlist := (STRINGIMAGE (SPADLET |$saturnContextMenuIndex| - (PLUS |$saturnContextMenuIndex| + (+ |$saturnContextMenuIndex| 1)))) (|writeSaturnLines| (CONS "\\newmenu{BCM" @@ -16462,7 +16462,7 @@ $dbKindAlist := ;writeSaturnSuffix() == ; $saturnContextMenuLines => saturnPRINTEXP '"}}" -(DEFUN |writeSaturnSuffix| () +(defun |writeSaturnSuffix| () (declare (special |$saturnContextMenuLines|)) (SEQ (COND (|$saturnContextMenuLines| @@ -16474,7 +16474,7 @@ $dbKindAlist := ; sockSendInt($MenuServer, $SendLine) ; sockSendString($MenuServer, line) -(DEFUN |issueHTStandard| (|line|) +(defun |issueHTStandard| (|line|) (declare (special |$standard| |$MenuServer| |$SendLine|)) (COND (|$standard| (|sockSendInt| |$MenuServer| |$SendLine|) @@ -16492,7 +16492,7 @@ $dbKindAlist := ; issueHT line ; endHTPage() -(DEFUN |htMakeErrorPage| (|htPage|) +(defun |htMakeErrorPage| (|htPage|) (PROG (|line|) (declare (special |$newPage| |$htLineList| |$curPage| |$saturnPage| |$standard| |$saturn|)) @@ -16513,7 +16513,7 @@ $dbKindAlist := ; if line ^= '"" and line.0 = char '_\ then saturnTERPRI() ; saturnPRINTEXP line -(DEFUN |writeSaturnLines| (|lines|) +(defun |writeSaturnLines| (|lines|) (SEQ (DO ((G178298 |lines| (CDR G178298)) (|line| NIL)) ((OR (ATOM G178298) (PROGN (SETQ |line| (CAR G178298)) NIL)) @@ -16586,7 +16586,7 @@ $dbKindAlist := ; writeSaturn line ; systemError code -(DEFUN |writeSaturn| (|line|) +(defun |writeSaturn| (|line|) (PROG (|n| |code| |k| |segment| |tabCode| |beginCode| |i| |endCode|) (declare (special |$marg|)) (RETURN @@ -16599,11 +16599,11 @@ $dbKindAlist := ((NEQUAL (ELT |line| |k|) (|char| '|\\|)) 'T) ((SPADLET |code| (|isBreakSegment?| |line| - (PLUS |k| 1) |n|)) + (+ |k| 1) |n|)) NIL) ('T 'T))) NIL) - (SEQ (EXIT (SPADLET |k| (PLUS |k| 1))))) + (SEQ (EXIT (SPADLET |k| (+ |k| 1))))) (COND ((> |k| |n|) (|writeSaturnPrint| |line|)) ('T (SPADLET |segment| (SUBSTRING |line| 0 |k|)) @@ -16611,73 +16611,73 @@ $dbKindAlist := (COND ((EQL |code| 1) (|writeSaturnPrint| "\\\\") - (|writeSaturn| (SUBSTRING |line| (PLUS |k| 2) NIL))) + (|writeSaturn| (SUBSTRING |line| (+ |k| 2) NIL))) ((EQL |code| 2) (|writeSaturnPrint| " &") - (|writeSaturn| (SUBSTRING |line| (PLUS |k| 4) NIL))) + (|writeSaturn| (SUBSTRING |line| (+ |k| 4) NIL))) ((EQL |code| 3) (|writeSaturnPrint| "\\item") - (|writeSaturn| (SUBSTRING |line| (PLUS |k| 5) NIL))) + (|writeSaturn| (SUBSTRING |line| (+ |k| 5) NIL))) ((EQL |code| 4) (|writeSaturnPrint| "\\newline") - (|writeSaturn| (SUBSTRING |line| (PLUS |k| 8) NIL))) + (|writeSaturn| (SUBSTRING |line| (+ |k| 8) NIL))) ((EQL |code| 5) (|writeSaturnPrint| "\\table{") - (SPADLET |$marg| (PLUS |$marg| 3)) + (SPADLET |$marg| (+ |$marg| 3)) (|writeSaturnTable| - (SUBSTRING |line| (PLUS |k| 7) NIL))) + (SUBSTRING |line| (+ |k| 7) NIL))) ((EQL |code| 6) (SPADLET |i| (|charPosition| (|char| '}) |line| - (PLUS |k| 4))) + (+ |k| 4))) (SPADLET |tabCode| (SUBSTRING |line| |k| - (PLUS (SPADDIFFERENCE |i| |k|) 1))) + (+ (SPADDIFFERENCE |i| |k|) 1))) (|writeSaturnPrint| |tabCode|) - (SPADLET |line| (SUBSTRING |line| (PLUS |i| 1) NIL)) + (SPADLET |line| (SUBSTRING |line| (+ |i| 1) NIL)) (|writeSaturn| |line|)) ((EQL |code| 7) (|saturnTERPRI|) - (|writeSaturn| (SUBSTRING |line| (PLUS |k| 2) NIL))) + (|writeSaturn| (SUBSTRING |line| (+ |k| 2) NIL))) ((EQL |code| 8) (SPADLET |i| (COND ((|substring?| "\\beginmenu" |line| |k|) - (PLUS |k| 9)) + (+ |k| 9)) ((|substring?| "\\beginscroll" |line| |k|) - (PLUS |k| 11)) + (+ |k| 11)) ('T (|charPosition| (|char| '}) |line| |k|)))) (COND ((BOOT-EQUAL (|char| '[) - (ELT |line| (PLUS |i| 1))) + (ELT |line| (+ |i| 1))) (SPADLET |i| (|charPosition| (|char| ']) |line| - (PLUS |i| 2))))) + (+ |i| 2))))) (SPADLET |beginCode| (SUBSTRING |line| |k| - (PLUS (SPADDIFFERENCE |i| |k|) 1))) + (+ (SPADDIFFERENCE |i| |k|) 1))) (|writeSaturnPrint| |beginCode|) - (SPADLET |line| (SUBSTRING |line| (PLUS |i| 1) NIL)) + (SPADLET |line| (SUBSTRING |line| (+ |i| 1) NIL)) (|writeSaturn| |line|)) ((EQL |code| 9) (SPADLET |i| (COND ((|substring?| "\\endmenu" |line| |k|) - (PLUS |k| 7)) + (+ |k| 7)) ((|substring?| "\\endscroll" |line| |k|) - (PLUS |k| 9)) + (+ |k| 9)) ('T (|charPosition| (|char| '}) |line| |k|)))) (SPADLET |endCode| (SUBSTRING |line| |k| - (PLUS (SPADDIFFERENCE |i| |k|) 1))) + (+ (SPADDIFFERENCE |i| |k|) 1))) (|writeSaturnPrint| |endCode|) - (SPADLET |line| (SUBSTRING |line| (PLUS |i| 1) NIL)) + (SPADLET |line| (SUBSTRING |line| (+ |i| 1) NIL)) (SPADLET |$marg| (SPADDIFFERENCE |$marg| 3)) (|writeSaturn| |line|)) ('T (|systemError| |code|)))))))))) @@ -16711,7 +16711,7 @@ $dbKindAlist := ; nil ; nil -(DEFUN |isBreakSegment?| (|line| |k| |n|) +(defun |isBreakSegment?| (|line| |k| |n|) (PROG (|char2|) (RETURN (COND @@ -16733,12 +16733,12 @@ $dbKindAlist := ('T NIL))) ((BOOT-EQUAL |char2| (|char| '|t|)) (COND - ((> (SPADLET |k| (PLUS |k| 2)) |n|) NIL) + ((> (SPADLET |k| (+ |k| 2)) |n|) NIL) ((AND (BOOT-EQUAL (ELT |line| (SPADDIFFERENCE |k| 1)) (|char| '|a|)) (BOOT-EQUAL (ELT |line| |k|) (|char| '|b|))) (COND - ((> (SPADLET |k| (PLUS |k| 1)) |n|) NIL) + ((> (SPADLET |k| (+ |k| 1)) |n|) NIL) ((BOOT-EQUAL (ELT |line| |k|) (|char| '{)) 6) ((|substring?| "table" |line| (SPADDIFFERENCE |k| 3)) @@ -16760,7 +16760,7 @@ $dbKindAlist := ; saturnPRINTEXP s ; saturnTERPRI() -(DEFUN |writeSaturnPrint| (|s|) +(defun |writeSaturnPrint| (|s|) (declare (special |$marg|)) (SEQ (PROGN (DO ((G178364 (SPADDIFFERENCE |$marg| 1)) @@ -16774,7 +16774,7 @@ $dbKindAlist := ; $browserOutputStream => PRINTEXP(s,$browserOutputStream) ; PRINTEXP s -(DEFUN |saturnPRINTEXP| (|s|) +(defun |saturnPRINTEXP| (|s|) (declare (special |$browserOutputStream| |$browserOutputStream|)) (COND (|$browserOutputStream| (PRINTEXP |s| |$browserOutputStream|)) @@ -16784,7 +16784,7 @@ $dbKindAlist := ; $browserOutputStream => TERPRI($browserOutputStream) ; TERPRI() -(DEFUN |saturnTERPRI| () +(defun |saturnTERPRI| () (declare (special |$browserOutputStream|)) (COND (|$browserOutputStream| (TERPRI |$browserOutputStream|)) @@ -16801,7 +16801,7 @@ $dbKindAlist := ; writeSaturnPrint SUBSTRING(line,0,close + 1) ; writeSaturn SUBSTRING(line, close + 1,nil) -(DEFUN |writeSaturnTable| (|line|) +(defun |writeSaturnTable| (|line|) (PROG (|open| |close|) (declare (special |$marg|)) (RETURN @@ -16813,14 +16813,14 @@ $dbKindAlist := (COND ((> |close| |open|) (SPADLET |close| - (OR (|findBalancingBrace| |line| (PLUS |open| 1) + (OR (|findBalancingBrace| |line| (+ |open| 1) (MAXINDEX |line|) 0) (|error| "no balancing brace"))) - (|writeSaturnPrint| (SUBSTRING |line| 0 (PLUS |close| 1))) - (|writeSaturnTable| (SUBSTRING |line| (PLUS |close| 1) NIL))) + (|writeSaturnPrint| (SUBSTRING |line| 0 (+ |close| 1))) + (|writeSaturnTable| (SUBSTRING |line| (+ |close| 1) NIL))) ('T (SPADLET |$marg| (SPADDIFFERENCE |$marg| 3)) - (|writeSaturnPrint| (SUBSTRING |line| 0 (PLUS |close| 1))) - (|writeSaturn| (SUBSTRING |line| (PLUS |close| 1) NIL)))))))) + (|writeSaturnPrint| (SUBSTRING |line| 0 (+ |close| 1))) + (|writeSaturn| (SUBSTRING |line| (+ |close| 1) NIL)))))))) ;findBalancingBrace(s,k,n,level) == ; k > n => nil @@ -16831,7 +16831,7 @@ $dbKindAlist := ; findBalancingBrace(s, k + 1, n, level - 1) ; findBalancingBrace(s, k + 1, n, level) -(DEFUN |findBalancingBrace| (|s| |k| |n| |level|) +(defun |findBalancingBrace| (|s| |k| |n| |level|) (PROG (|c|) (RETURN (COND @@ -16839,15 +16839,15 @@ $dbKindAlist := ('T (SPADLET |c| (ELT |s| |k|)) (COND ((BOOT-EQUAL |c| (|char| '{)) - (|findBalancingBrace| |s| (PLUS |k| 1) |n| - (PLUS |level| 1))) + (|findBalancingBrace| |s| (+ |k| 1) |n| + (+ |level| 1))) ((BOOT-EQUAL |c| (|char| '})) (COND ((EQL |level| 0) |k|) ('T - (|findBalancingBrace| |s| (PLUS |k| 1) |n| + (|findBalancingBrace| |s| (+ |k| 1) |n| (SPADDIFFERENCE |level| 1))))) - ('T (|findBalancingBrace| |s| (PLUS |k| 1) |n| |level|)))))))) + ('T (|findBalancingBrace| |s| (+ |k| 1) |n| |level|)))))))) ;--======================================================================= ;-- htMakePage and friends @@ -16856,7 +16856,7 @@ $dbKindAlist := ; $saturn => nil ; htMakePage itemList -(DEFUN |htMakePageStandard| (|itemList|) +(defun |htMakePageStandard| (|itemList|) (declare (special |$saturn|)) (COND (|$saturn| NIL) ('T (|htMakePage| |itemList|)))) @@ -16864,7 +16864,7 @@ $dbKindAlist := ; $standard => nil ; htMakePage itemList -(DEFUN |htMakePageSaturn| (|itemList|) +(defun |htMakePageSaturn| (|itemList|) (declare (special |$standard|)) (COND (|$standard| NIL) ('T (|htMakePage| |itemList|)))) @@ -16875,7 +16875,7 @@ $dbKindAlist := ; if $standard then htpAddToPageDescription($curPage, itemList) ; htMakePage1 itemList -(DEFUN |htMakePage| (|itemList|) +(defun |htMakePage| (|itemList|) (declare (special |$newPage| |$curPage| |$standard| |$saturn| |$saturnPage|)) (PROGN (COND @@ -16921,7 +16921,7 @@ $dbKindAlist := ; itemType = 'doitButton => htProcessDoitButton items ; systemError '"unexpected branch" -(DEFUN |htMakePage1| (|itemList|) +(defun |htMakePage1| (|itemList|) (PROG (|s| |itemType| |items|) (RETURN (SEQ (DO ((G178417 |itemList| (CDR G178417)) (|u| NIL)) @@ -16995,7 +16995,7 @@ $dbKindAlist := ; x is [['text,:r],:.] => r ; error nil -(DEFUN |saturnTran| (|x|) +(defun |saturnTran| (|x|) (PROG (|kind| |ISTMP#2| |ISTMP#3| |s1| |ISTMP#4| |s2| |callTail| |text| |fs| |y| |t1| |t2| |t| |ISTMP#1| |r|) (RETURN @@ -17051,7 +17051,7 @@ $dbKindAlist := ; [:s, '"}"] ; ['"{\bf ", :secondPart] -(DEFUN |mkBold| (|s|) +(defun |mkBold| (|s|) (PROG (|secondPart|) (RETURN (PROGN @@ -17063,11 +17063,11 @@ $dbKindAlist := ;mkMenuButton() == [menuButton()] -(DEFUN |mkMenuButton| () (CONS (|menuButton|) NIL)) +(defun |mkMenuButton| () (CONS (|menuButton|) NIL)) ;menuButton() == '"\menuitemstyle{}" -(DEFUN |menuButton| () "\\menuitemstyle{}") +(defun |menuButton| () "\\menuitemstyle{}") ;-- Saturn must translate \menuitemstyle ==> {\menuButton} ;--------------------> NEW DEFINITION (override in ht-util.boot.pamphlet) @@ -17076,7 +17076,7 @@ $dbKindAlist := ; func := mkCurryFun(first form, rest form) ; STRCONC('"(|htDoneButton| '|", func, '"| ",htpName page(), '")") -(DEFUN |getCallBackFn| (|form|) +(defun |getCallBackFn| (|form|) (PROG (|func|) (RETURN (PROGN @@ -17090,7 +17090,7 @@ $dbKindAlist := ; if atom s then s := [s] ; ['"\lispLink[d]{\verb!", :code, '"!}{", :s, '"}"] -(DEFUN |mkDocLink| (|code| |s|) +(defun |mkDocLink| (|code| |s|) (PROGN (COND ((ATOM |code|) (SPADLET |code| (CONS |code| NIL)))) (COND ((ATOM |s|) (SPADLET |s| (CONS |s| NIL)))) @@ -17106,7 +17106,7 @@ $dbKindAlist := ; x is [['text, :s],:r] => unTab [:s, :saturnTranText r] ; error nil -(DEFUN |saturnTranText| (|x|) +(defun |saturnTranText| (|x|) (PROG (|fn| |ISTMP#1| |s| |r|) (RETURN (COND @@ -17134,7 +17134,7 @@ $dbKindAlist := ; 15 = STRING_<('"\menuitemstyle{", s) => SUBSTRING(s,15,(MAXINDEX s) - 15) ; nil -(DEFUN |isMenuItemStyle?| (|s|) +(defun |isMenuItemStyle?| (|s|) (COND ((EQL 15 (STRING< "\\menuitemstyle{" |s|)) (SUBSTRING |s| 15 (SPADDIFFERENCE (MAXINDEX |s|) 15))) @@ -17145,7 +17145,7 @@ $dbKindAlist := ; callTail is [fn] => callTail ; error nil -(DEFUN |getCallBack| (|callTail|) +(defun |getCallBack| (|callTail|) (PROG (|fn|) (declare (special |$callTailList|)) (RETURN @@ -17164,7 +17164,7 @@ $dbKindAlist := ; $standard => sockSendInt($MenuServer, $EndOfPage) ; nil -(DEFUN |endHTPage| () +(defun |endHTPage| () (declare (special |$standard| |$MenuServer| |$EndOfPage|)) (COND (|$standard| (|sockSendInt| |$MenuServer| |$EndOfPage|)) @@ -17177,7 +17177,7 @@ $dbKindAlist := ; $saturn => '"\hrule{}\newline{}" ; '"\horizontalline{}\newline{}" -(DEFUN |htSayHrule| () +(defun |htSayHrule| () (declare (special |$saturn|)) (|bcHt| (COND (|$saturn| "\\hrule{}\\newline{}") @@ -17188,7 +17188,7 @@ $dbKindAlist := ;------------> Add STRINGIMAGE ; SETELT(htPage, 5, [[label, nil, nil, nil, :prop], :ELT(htPage, 5)]) -(DEFUN |htpAddInputAreaProp| (|htPage| |label| |prop|) +(defun |htpAddInputAreaProp| (|htPage| |label| |prop|) (SETELT |htPage| 5 (CONS (CONS |label| (CONS NIL (CONS NIL (CONS NIL |prop|)))) (ELT |htPage| 5)))) @@ -17201,7 +17201,7 @@ $dbKindAlist := ; props => SETELT(props, 0, STRINGIMAGE val) ; nil -(DEFUN |htpSetLabelInputString| (|htPage| |label| |val|) +(defun |htpSetLabelInputString| (|htPage| |label| |val|) (PROG (|props|) (RETURN (PROGN @@ -17222,7 +17222,7 @@ $dbKindAlist := ; systemError ['"unknown function", func] ; FUNCALL(SYMBOL_-FUNCTION func, htPage) -(DEFUN |htDoneButton| +(defun |htDoneButton| (&REST G178588 &AUX |optionalArgs| |htPage| |func|) (DSETQ (|func| |htPage| . |optionalArgs|) G178588) (PROGN @@ -17248,7 +17248,7 @@ $dbKindAlist := ; mkCurryFun(func, value),skipStateInfo?) ; bcIssueHt info -(DEFUN |htBcLinks| (&REST G178631 &AUX |options| |links|) +(defun |htBcLinks| (&REST G178631 &AUX |options| |links|) (DSETQ (|links| . |options|) G178631) (PROG (|skipStateInfo?| |LETTMP#1| |message| |info| |func| |value| |link|) @@ -17293,7 +17293,7 @@ $dbKindAlist := ; htMakeButton(link ,message, mkCurryFun(func, value)) ; bcIssueHt info -(DEFUN |htBcLispLinks| (|links|) +(defun |htBcLispLinks| (|links|) (PROG (|LETTMP#1| |options| |message| |info| |func| |value| |link|) (declare (special |$saturn|)) (RETURN @@ -17340,7 +17340,7 @@ $dbKindAlist := ; iht '") " ; iht [htpName $curPage, '"))}"] -(DEFUN |htMakeButton| +(defun |htMakeButton| (&REST G178699 &AUX |options| |func| |message| |htCommand|) (DSETQ (|htCommand| |message| |func| . |options|) G178699) (PROG (|skipStateInfo?| |id| |type|) @@ -17421,7 +17421,7 @@ $dbKindAlist := ; bcIssueHt message ; iht '"}" -(DEFUN |htMakeButtonSaturn| (|htCommand| |message| |func| |options|) +(defun |htMakeButtonSaturn| (|htCommand| |message| |func| |options|) (PROG (|skipStateInfo?|) (declare (special |$kPageSaturnArguments| |$PatternVariableList| |$saturnPage|)) @@ -17482,7 +17482,7 @@ $dbKindAlist := ; nconc(nreverse COPY_-LIST pageDescrip, ELT(htPage, 7)) ; SETELT(htPage, 7, newDescript) -(DEFUN |htpAddToPageDescription| (|htPage| |pageDescrip|) +(defun |htpAddToPageDescription| (|htPage| |pageDescrip|) (PROG (|newDescript|) (RETURN (PROGN @@ -17508,7 +17508,7 @@ $dbKindAlist := ; iht ['"\inputstring{", stringName, '"}{", ; numChars, '"}{", htpLabelDefault(page(),stringName), '"} ", mess2] -(DEFUN |htProcessBcStrings| (|strings|) +(defun |htProcessBcStrings| (|strings|) (PROG (|numChars| |default| |stringName| |spadType| |filter| |mess2|) (RETURN (SEQ (DO ((G178748 |strings| (CDR G178748)) (G178733 NIL)) @@ -17561,7 +17561,7 @@ $dbKindAlist := ;setUpDefault(name, props) == ; htpAddInputAreaProp(page(), name, props) -(DEFUN |setUpDefault| (|name| |props|) +(defun |setUpDefault| (|name| |props|) (|htpAddInputAreaProp| (|page|) |name| |props|)) ;--------------------> NEW DEFINITION (override in ht-util.boot.pamphlet) @@ -17571,7 +17571,7 @@ $dbKindAlist := ; htSayStandard '"\beginscroll " ; page() -(DEFUN |htInitPage| (|title| |propList|) +(defun |htInitPage| (|title| |propList|) (PROGN (|htInitPageNoScroll| |propList| |title|) (|htSayStandard| "\\beginscroll ") @@ -17597,7 +17597,7 @@ $dbKindAlist := ; htSayStandard '"} " ; page() -(DEFUN |htInitPageNoScroll| (&REST G178785 &AUX |options| |propList|) +(defun |htInitPageNoScroll| (&REST G178785 &AUX |options| |propList|) (DSETQ (|propList| . |options|) G178785) (PROG (|title|) (declare (special |$atLeastOneUnexposed| |$saturnContextMenuLines| @@ -17639,7 +17639,7 @@ $dbKindAlist := ; $htLineList := nil ; page() -(DEFUN |htInitPageNoHeading| (|propList|) +(defun |htInitPageNoHeading| (|propList|) (declare (special |$curPage| |$standard| |$saturn| |$saturnPage| |$newPage| |$htLineList|)) (COND @@ -17658,7 +17658,7 @@ $dbKindAlist := ; SET(name, val := VECTOR(name, nil, nil, nil, nil, nil, propList, nil)) ; val -(DEFUN |htpMakeEmptyPage| (&REST G178801 &AUX |options| |propList|) +(defun |htpMakeEmptyPage| (&REST G178801 &AUX |options| |propList|) (DSETQ (|propList| . |options|) G178801) (PROG (|name| |val|) (declare (special |$activePageList| |$saturn|)) @@ -17721,7 +17721,7 @@ $dbKindAlist := ; htSay '"}" ; if $standard then htEndTable() -(DEFUN |kPageContextMenu| (|page|) +(defun |kPageContextMenu| (|page|) (PROG (|LETTMP#1| |kind| |name| |nargs| |xpart| |sig| |args| |abbrev| |comments| |conform| |conname| |pathname|) (declare (special |$saturn| |$standard|)) @@ -17909,7 +17909,7 @@ $dbKindAlist := ; htSayCold '"U\&ses" ; $saturnContextMenuLines := $htLineList -(DEFUN |kPageContextMenuSaturn| (|page|) +(defun |kPageContextMenuSaturn| (|page|) (PROG (|$newPage| |$htLineList| |LETTMP#1| |kind| |nargs| |xpart| |sig| |args| |abbrev| |comments| |conform| |conname| |name|) @@ -18047,7 +18047,7 @@ $dbKindAlist := ; htSay '"\docLink{\csname " ; htSay STRCONC(CAR(CDR(lname)), '"\endcsname}{E&xamples}") -(DEFUN |saturnExampleLink| (|lname|) +(defun |saturnExampleLink| (|lname|) (PROGN (|htSay| "\\docLink{\\csname ") (|htSay| (STRCONC (CAR (CDR |lname|)) @@ -18062,7 +18062,7 @@ $dbKindAlist := ; $exampleConstructors := getSaturnExampleList() ; ASSQ(conname, $exampleConstructors) -(DEFUN |saturnHasExamplePage| (|conname|) +(defun |saturnHasExamplePage| (|conname|) (declare (special |$exampleConstructors|)) (PROGN (COND @@ -18078,7 +18078,7 @@ $dbKindAlist := ; SHUT fp ; lst -(DEFUN |getSaturnExampleList| () +(defun |getSaturnExampleList| () (PROG (|file| |fp| |lst|) (RETURN (PROGN @@ -18143,7 +18143,7 @@ $dbKindAlist := ; htSay '"}" ; if $standard then htEndTable() -(DEFUN |dbPresentCons| +(defun |dbPresentCons| (&REST G178985 &AUX |exclusions| |kind| |htPage|) (DSETQ (|htPage| |kind| . |exclusions|) G178985) (PROG (|cAlist| |empty?| |one?| |exposedUnexposedFlag| |star?|) @@ -18362,7 +18362,7 @@ $dbKindAlist := ; if $standard then htEndTable() ; $saturnContextMenuLines := $htLineList -(DEFUN |dbPresentConsSaturn| (|htPage| |kind| |exclusions|) +(defun |dbPresentConsSaturn| (|htPage| |kind| |exclusions|) (PROG (|$htLineList| |$newPage| |cAlist| |empty?| |one?| |exposedUnexposedFlag| |star?|) (DECLARE (SPECIAL |$htLineList| |$newPage| |$saturnContextMenuLines| @@ -18533,7 +18533,7 @@ $dbKindAlist := ; htSay '"}" ; htShowPage() -(DEFUN |htFilterPage| (|htPage| |args|) +(defun |htFilterPage| (|htPage| |args|) (PROGN (|htInitPage| '|Filter String| (|htCopyProplist| |htPage|)) (|htSay| '|\\centerline{Enter filter string (use {\\em *} for wild card):}|) @@ -18568,7 +18568,7 @@ $dbKindAlist := ; htSay '"{\centerline{Enter filter string (use {\em *} for wild card):}}" ; htSay '"{Filter Page}{\&Filter}" -(DEFUN |htMakeSaturnFilterPage| (G179039) +(defun |htMakeSaturnFilterPage| (G179039) (PROG (|fn2Call| |args|) (declare (special |$saturnPage|)) (RETURN @@ -18624,7 +18624,7 @@ $dbKindAlist := ; htEndMenu 'description ; htSayStandard '"\indent{0}" -(DEFUN |dbShowConsKinds| (|cAlist|) +(defun |dbShowConsKinds| (|cAlist|) (PROG (|op| |kind| |cats| |doms| |paks| |defs| |lists| |kinds| |firstTime| |c|) (RETURN @@ -18668,7 +18668,7 @@ $dbKindAlist := (SEQ (EXIT (COND ((> (|#| |x|) 0) (SETQ G179081 - (PLUS G179081 1)))))))))) + (+ G179081 1)))))))))) (SPADLET |firstTime| 'T) (DO ((G179109 '("category" "domain" "package" @@ -18782,7 +18782,7 @@ $dbKindAlist := ; htSaySaturn '"}}" ; htEndTabular() -(DEFUN |addParameterTemplates| (|page| |conform|) +(defun |addParameterTemplates| (|page| |conform|) (PROG (|parlist| |manuelsCode?| |w| |argSublis| |firstTime| |odd| |a| |r| |argstring|) (declare (special |$conArgstrings| |$saturn| |$PatternVariableList|)) @@ -18921,7 +18921,7 @@ $dbKindAlist := ; bcConform(typeForm,true) ; htEndTabular() -(DEFUN |kPageArgs| (G179254 G179269) +(defun |kPageArgs| (G179254 G179269) (PROG (|source| |op| |args| |coSig| |firstTime| |ISTMP#1| |ISTMP#2| |t1| |typeForm|) (RETURN @@ -19007,7 +19007,7 @@ $dbKindAlist := ; :form2StringList opOf form,"}"] ; ["\conf{",:form2StringList opOf form,'"}{",:form2Fence dbOuttran form,'"}"] -(DEFUN |dbConform| (|form|) +(defun |dbConform| (|form|) (declare (special |$saturn|)) (COND (|$saturn| @@ -19026,7 +19026,7 @@ $dbKindAlist := ;--------------------> NEW DEFINITION (see br-op1.boot.pamphlet) ;htTab s == if $standard then htSayStandard ('"\tab{",s,'"}") -(DEFUN |htTab| (|s|) +(defun |htTab| (|s|) (declare (special |$standard|)) (COND (|$standard| @@ -19070,7 +19070,7 @@ $dbKindAlist := ; bincount := bincount + 1 ; htEndMenu 'description -(DEFUN |dbGatherThenShow| +(defun |dbGatherThenShow| (|htPage| |opAlist| |which| |data| |constructorIfTrue| |word| |fn|) (declare (ignore |htPage| |opAlist|)) @@ -19110,7 +19110,7 @@ $dbKindAlist := NIL)) (SPADLET |button| (|mkButtonBox| - (PLUS 1 |bincount|))) + (+ 1 |bincount|))) (|htMakePageSaturn| (CONS (CONS '|bcLinks| @@ -19155,8 +19155,8 @@ $dbKindAlist := (FUNCALL |fn| |thing|))) (|htSay| ":\\newline ") (|dbShowOpSigList| |which| |items| - (TIMES (PLUS 1 |bincount|) 8192)) - (SPADLET |bincount| (PLUS |bincount| 1)))))) + (TIMES (+ 1 |bincount|) 8192)) + (SPADLET |bincount| (+ |bincount| 1)))))) (|htEndMenu| '|description|)))))) ;--------------------> NEW DEFINITION (see br-op1.boot.pamphlet) @@ -19235,7 +19235,7 @@ $dbKindAlist := ; htSay '"}" ; htEndTable() -(DEFUN |dbPresentOps| +(defun |dbPresentOps| (&REST G179404 &AUX |exclusions| |which| |htPage|) (DSETQ (|htPage| |which| . |exclusions|) G179404) (PROG (|fromConPage?| |usage?| |star?| |implementation?| @@ -19505,7 +19505,7 @@ $dbKindAlist := ; else htMakePage [['bcLinks,['"Exposed Onl\&y",'"",'dbShowOps,which,'exposureOn]]] ; $saturnContextMenuLines := $htLineList -(DEFUN |dbPresentOpsSaturn| (|htPage| |which| |exclusions|) +(defun |dbPresentOpsSaturn| (|htPage| |which| |exclusions|) (PROG (|$htLineList| |$newPage| |fromConPage?| |usage?| |star?| |implementation?| |rightmost?| |opAlist| |empty?| |entry| |one?| |conname|) @@ -19704,7 +19704,7 @@ $dbKindAlist := ; htMakePage [['bcLinks,['"Exposed Only",'"",'repeatSearch,'T]]] ; htShowPageNoScroll() -(DEFUN |htShowPageStar| () +(defun |htShowPageStar| () (declare (special |$saturn| |$exposedOnlyIfTrue|)) (COND (|$saturn| (|htShowPageStarSaturn|)) @@ -19740,7 +19740,7 @@ $dbKindAlist := ; $saturnContextMenuLines := $htLineList ; htShowPageNoScroll() -(DEFUN |htShowPageStarSaturn| () +(defun |htShowPageStarSaturn| () (PROG (|$newPage| |$htLineList|) (DECLARE (SPECIAL |$newPage| |$htLineList| |$saturnContextMenuLines| |$exposedOnlyIfTrue|)) @@ -19981,7 +19981,7 @@ $dbKindAlist := ; ----------------------------------------------------------- ; htSaySaturn '"\end{tabular}" -(DEFUN |displayDomainOp| +(defun |displayDomainOp| (|htPage| |which| |origin| |op| |sig| |predicate| |doc| |index| |chooseFn| |unexposed?| |$generalSearch?|) (DECLARE (SPECIAL |$generalSearch?|)) @@ -20413,7 +20413,7 @@ $dbKindAlist := ; htMakePage [['text,'"\unixcommand{",filename,'"}{_\$AXIOM/lib/SPADEDIT ", ; sourceFileName, '" ", conname, '"}"]] -(DEFUN |htSaySourceFile| (|conname|) +(defun |htSaySourceFile| (|conname|) (PROG (|sourceFileName| |filename|) (RETURN (PROGN @@ -20445,7 +20445,7 @@ $dbKindAlist := ; ['"\indent{",STRINGIMAGE m,'"}\tab{0}"] ; n < 0 => ['"\indent{0}\newline "] -(DEFUN |htSayIndentRel| (&REST G179673 &AUX |options| |n|) +(defun |htSayIndentRel| (&REST G179673 &AUX |options| |n|) (DSETQ (|n| . |options|) G179673) (PROG (|flag| |m|) (declare (special |$standard|)) @@ -20453,7 +20453,7 @@ $dbKindAlist := (PROGN (SPADLET |flag| (IFCAR |options|)) (SPADLET |m| (abs |n|)) - (COND (|flag| (SPADLET |m| (PLUS |m| 2)))) + (COND (|flag| (SPADLET |m| (+ |m| 2)))) (COND (|$standard| (|htSayStandard| @@ -20476,7 +20476,7 @@ $dbKindAlist := ; htSay '"{\em *}" ; $atLeastOneUnexposed := true -(DEFUN |htSayUnexposed| () +(defun |htSayUnexposed| () (declare (special |$atLeastOneUnexposed|)) (PROGN (|htSay| "{\\em *}") @@ -20488,7 +20488,7 @@ $dbKindAlist := ;htEndTabular() == ; htSaySaturn '"\end{tabular}" -(DEFUN |htEndTabular| () +(defun |htEndTabular| () (|htSaySaturn| "\\end{tabular}")) ;htPopSaturn s == @@ -20496,7 +20496,7 @@ $dbKindAlist := ; pageDescription is [=s,:b] => SETELT($saturnPage, 7, CDR pageDescription) ; nil -(DEFUN |htPopSaturn| (|s|) +(defun |htPopSaturn| (|s|) (PROG (|pageDescription| |b|) (declare (special |$saturnPage|)) (RETURN @@ -20513,7 +20513,7 @@ $dbKindAlist := ; htSaySaturn '"\begin{dirlist}[lv]" ; htSayStandard '"\table{" -(DEFUN |htBeginTable| () +(defun |htBeginTable| () (PROGN (|htSaySaturn| "\\begin{dirlist}[lv]") (|htSayStandard| "\\table{"))) @@ -20522,7 +20522,7 @@ $dbKindAlist := ; htSaySaturn '"\end{dirlist}" ; htSayStandard '"}" -(DEFUN |htEndTable| () +(defun |htEndTable| () (PROGN (|htSaySaturn| "\\end{dirlist}") (|htSayStandard| "}"))) @@ -20539,7 +20539,7 @@ $dbKindAlist := ; null skip => htSayStandard '"\beginmenu " ; nil -(DEFUN |htBeginMenu| (&REST G179703 &AUX |options| |kind|) +(defun |htBeginMenu| (&REST G179703 &AUX |options| |kind|) (DSETQ (|kind| . |options|) G179703) (PROG (|skip|) (declare (special |$saturn|)) @@ -20568,7 +20568,7 @@ $dbKindAlist := ; htSaySaturn '"\end{tabular}" ; htSayStandard '"\endmenu " -(DEFUN |htEndMenu| (|kind|) +(defun |htEndMenu| (|kind|) (declare (special |$saturn|)) (PROGN (COND @@ -20587,7 +20587,7 @@ $dbKindAlist := ; if $standard then ; htSayStandard ["\lispdownlink{",nameShown,'"}{(|conPage| '|",name,'"|)}"] -(DEFUN |htSayConstructorName| (|nameShown| |name|) +(defun |htSayConstructorName| (|nameShown| |name|) (PROG (|code|) (declare (special |$standard| |$saturn|)) (RETURN @@ -20613,7 +20613,7 @@ $dbKindAlist := ; htNewPage title ; page() -(DEFUN |htAddHeading| (|title|) +(defun |htAddHeading| (|title|) (PROGN (|htNewPage| |title|) (|page|))) ;------------> called by htAddHeading, htInitPageNoScroll <----------- @@ -20626,7 +20626,7 @@ $dbKindAlist := ; htSayStandard title ; htSayStandard '"}" -(DEFUN |htNewPage| (|title|) +(defun |htNewPage| (|title|) (declare (special |$saturn| |$curPage| |$standard|)) (PROGN (COND @@ -20646,18 +20646,18 @@ $dbKindAlist := ; null x => nil ; [$saturnAmpersand, x,:fn rest x] -(DEFUN |mkTabularItem,fn| (|x|) +(defun |mkTabularItem,fn| (|x|) (declare (special |$saturnAmpersand|)) (SEQ (IF (NULL |x|) (EXIT NIL)) (EXIT (CONS |$saturnAmpersand| (CONS |x| (|mkTabularItem,fn| (CDR |x|))))))) -(DEFUN |mkTabularItem| (|u|) +(defun |mkTabularItem| (|u|) (APPEND (CAR |u|) (|mkTabularItem,fn| (CDR |u|)))) ;htSaySaturnAmpersand() == htSaySaturn $saturnAmpersand -(DEFUN |htSaySaturnAmpersand| () +(defun |htSaySaturnAmpersand| () (declare (special |$saturnAmpersand|)) (|htSaySaturn| |$saturnAmpersand|)) @@ -20668,7 +20668,7 @@ $dbKindAlist := ; htSaySaturn '"\phantom{*}" ; htSayStandard '"\space{1}" -(DEFUN |htBlank| (&REST G179750 &AUX |options|) +(defun |htBlank| (&REST G179750 &AUX |options|) (DSETQ |options| G179750) (PROG (|n|) (RETURN @@ -20695,7 +20695,7 @@ $dbKindAlist := ; atom s => s ; [unTab1 first s, :rest s] -(DEFUN |unTab| (|s|) +(defun |unTab| (|s|) (COND ((STRINGP |s|) (|unTab1| |s|)) ((ATOM |s|) |s|) @@ -20706,20 +20706,20 @@ $dbKindAlist := ; SUBSTRING(s, k + 1, nil) ; s -(DEFUN |unTab1| (|s|) +(defun |unTab1| (|s|) (PROG (|k|) (RETURN (COND ((AND (EQL (STRING< "\\tab{" |s|) 5) (SPADLET |k| (|charPosition| (|char| '}) |s| 4))) - (SUBSTRING |s| (PLUS |k| 1) NIL)) + (SUBSTRING |s| (+ |k| 1) NIL)) ('T |s|))))) ;satBreak() == ; htSaySaturn '"\\ " ; htSayStandard '"\item " -(DEFUN |satBreak| () +(defun |satBreak| () (PROGN (|htSaySaturn| "\\\\ ") (|htSayStandard| "\\item "))) @@ -20728,14 +20728,14 @@ $dbKindAlist := ; htSaySaturn '"\bigskip{}" ; htSayStandard '"\vspace{1}\newline " -(DEFUN |htBigSkip| () +(defun |htBigSkip| () (PROGN (|htSaySaturn| "\\bigskip{}") (|htSayStandard| "\\vspace{1}\\newline "))) ;htSaturnBreak() == htSaySaturn '"\!" -(DEFUN |htSaturnBreak| () (|htSaySaturn| "\\!")) +(defun |htSaturnBreak| () (|htSaySaturn| "\\!")) ;satDownLink(s,code) == ; htSaySaturn '"\lispFunctionLink{\verb!" @@ -20750,7 +20750,7 @@ $dbKindAlist := ; htSayStandard code ; htSayStandard '"}" -(DEFUN |satDownLink| (|s| |code|) +(defun |satDownLink| (|s| |code|) (PROGN (|htSaySaturn| "\\lispFunctionLink{\\verb!") (|htSaySaturn| |code|) @@ -20776,7 +20776,7 @@ $dbKindAlist := ; htSayStandard code ; htSayStandard '"}" -(DEFUN |satTypeDownLink| (|s| |code|) +(defun |satTypeDownLink| (|s| |code|) (PROGN (|htSaySaturn| "\\lispLink[d]{\\verb!") (|htSaySaturn| |code|) @@ -20791,7 +20791,7 @@ $dbKindAlist := ;mkButtonBox n == STRCONC('"\buttonbox{", STRINGIMAGE n, '"}") -(DEFUN |mkButtonBox| (|n|) +(defun |mkButtonBox| (|n|) (STRCONC "\\buttonbox{" (STRINGIMAGE |n|) "}")) @@ -20873,7 +20873,7 @@ $dbKindAlist := ; OBEY STRCONC('"sort -f _"",sin,'".text_" > _"", sout, '".text_"") ; OBEY STRCONC('"rm ", sin, '".text") -(DEFUN |dbSort| (|x| |y|) +(defun |dbSort| (|x| |y|) (PROG (|sin| |sout|) (RETURN (PROGN @@ -20985,7 +20985,7 @@ $dbKindAlist := ; val:= [fun,signature',e] ; [fun,['Mapping,:signature'],oldE] -- oldE:= put($op,'value,removeEnv val,e) -(DEFUN |compDefineCapsuleFunction| +(defun |compDefineCapsuleFunction| (|df| |m| |oldE| |$prefix| |$formalArgList|) (DECLARE (SPECIAL |$prefix| |$formalArgList| |$FormalFunctionParameterList| |$signatureOfForm| |$functionLocations| |$profileCompiler| @@ -21187,7 +21187,7 @@ $dbKindAlist := ;;; *** |postSignature| REDEFINED -(DEFUN |postSignature| (G179951) +(defun |postSignature| (G179951) (PROG (|sig| |sig1| |op|) (RETURN (PROGN @@ -21214,7 +21214,7 @@ $dbKindAlist := ; :r]] ; sig -(DEFUN |postDoubleSharp| (|sig|) +(defun |postDoubleSharp| (|sig|) (PROG (|ISTMP#1| |ISTMP#2| |target| |r|) (declare (special |$FormalFunctionParameterList|)) (RETURN @@ -21304,7 +21304,7 @@ $dbKindAlist := ; bcHt escapeSpecialIds STRINGIMAGE x ; if $italics? then bcHt '"}" -(DEFUN |bcConform1,say| (|x|) +(defun |bcConform1,say| (|x|) (declare (special |$italics?|)) (SEQ (IF |$italics?| (|bcHt| "{\\em ") NIL) (IF (BOOT-EQUAL |x| '|etc|) (SPADLET |x| "...") @@ -21312,7 +21312,7 @@ $dbKindAlist := (|bcHt| (|escapeSpecialIds| (STRINGIMAGE |x|))) (EXIT (IF |$italics?| (|bcHt| "}") NIL)))) -(DEFUN |bcConform1,tl| (|u|) +(defun |bcConform1,tl| (|u|) (PROG (|firstTime|) (RETURN (SEQ (|bcHt| "(") (SPADLET |firstTime| 'T) @@ -21325,7 +21325,7 @@ $dbKindAlist := (EXIT (|bcConform1,hd| |x|)))) (EXIT (|bcHt| ")")))))) -(DEFUN |bcConform1,tuple| (|u|) +(defun |bcConform1,tuple| (|u|) (SEQ (IF (NULL |u|) (EXIT (|bcHt| "()"))) (IF (NULL (CDR |u|)) (EXIT (|bcConform1,hd| |u|))) (|bcHt| "(") (|bcConform1,hd| (CAR |u|)) @@ -21336,7 +21336,7 @@ $dbKindAlist := (SEQ (|bcHt| ",") (EXIT (|bcConform1,hd| |x|)))) (EXIT (|bcHt| ")")))) -(DEFUN |bcConform1,mapping| (G180044) +(defun |bcConform1,mapping| (G180044) (PROG (|target| |source|) (declare (special |$saturn|)) (RETURN @@ -21350,7 +21350,7 @@ $dbKindAlist := (EXIT " -> "))) (EXIT (|bcConform1,hd| |target|)))))))) -(DEFUN |bcConform1,hd| (|form|) +(defun |bcConform1,hd| (|form|) (PROG (|n| |s| |head| |r|) (declare (special |$italicHead?| |$bcMultipleNames| |$Primitives| |$FormalFunctionParameterList| |$FormalMapVariableList| @@ -21414,7 +21414,7 @@ $dbKindAlist := (IF (NULL (SPADLET |r| (QCDR |form|))) (EXIT NIL)) (EXIT (|bcConform1,tl| (QCDR |form|))))))) - (DEFUN |bcConform1| (|form|) + (defun |bcConform1| (|form|) (PROG (|ISTMP#1| |form1| |pred|) (RETURN (COND diff --git a/src/interp/c-doc.lisp.pamphlet b/src/interp/c-doc.lisp.pamphlet index 44dab1d..82d1c4a 100644 --- a/src/interp/c-doc.lisp.pamphlet +++ b/src/interp/c-doc.lisp.pamphlet @@ -248,7 +248,7 @@ ('T (STRCONC (SUBSTRING |s| 0 |k|) (|removeBackslashes| - (SUBSTRING |s| (PLUS |k| 1) NIL)))))) + (SUBSTRING |s| (+ |k| 1) NIL)))))) ('T |s|))))) ;checkNumOfArgs conform == @@ -340,9 +340,9 @@ (> |n| |k|) (SPADLET |j| (|charPosition| (|char| '|\||) |s| - (PLUS |k| 1))) + (+ |k| 1))) (> |n| |j|)) - (SUBSTRING |s| (PLUS |k| 1) + (SUBSTRING |s| (+ |k| 1) (SPADDIFFERENCE (SPADDIFFERENCE |j| |k|) 1))) ('T (|checkDocError| @@ -514,7 +514,7 @@ (COND ((EQL |k| 0) "") ((OR (>= |k| (SPADDIFFERENCE |n| 1)) - (NEQUAL (ELT |line| (PLUS |k| 1)) (|char| '%))) + (NEQUAL (ELT |line| (+ |k| 1)) (|char| '%))) |line|) ((> (|#| |line|) |k|) (SUBSTRING |line| 0 |k|)) ('T |line|)))))) @@ -541,7 +541,7 @@ (COND ((NEQUAL (ELT |line| (SPADDIFFERENCE |k| 1)) |$charBack|) |k|) - ('T (|htcharPosition| |char| |line| (PLUS |k| 1))))) + ('T (|htcharPosition| |char| |line| (+ |k| 1))))) ('T 0)))))) ;checkAddMacros u == @@ -733,14 +733,14 @@ ((NULL (AND (<= |i| |m|) (BOOT-EQUAL (ELT |l| |i|) '| |))) NIL) - (SEQ (EXIT (SPADLET |i| (PLUS |i| 1))))) + (SEQ (EXIT (SPADLET |i| (+ |i| 1))))) (COND ((> |i| |m|) NIL) ('T (SPADLET |buf| "") (SPADLET |ch| (ELT |l| |i|)) (COND ((BOOT-EQUAL |ch| |$charFauxNewline|) - (CONS |$stringFauxNewline| (CONS (PLUS |i| 1) NIL))) + (CONS |$stringFauxNewline| (CONS (+ |i| 1) NIL))) ('T (SPADLET |done| NIL) (DO () ((NULL (AND (<= |i| |m|) (NULL |done|))) NIL) (SEQ (EXIT (PROGN @@ -753,7 +753,7 @@ ('T (SPADLET |buf| (STRCONC |buf| |ch|)) - (SPADLET |i| (PLUS |i| 1)))))))) + (SPADLET |i| (+ |i| 1)))))))) (CONS |buf| (CONS |i| NIL))))))))))) ;checkGetArgs u == @@ -797,20 +797,20 @@ ((NULL (> |m| (SPADLET |k| (|charPosition| |$charComma| - |u| (PLUS |i| 1))))) + |u| (+ |i| 1))))) NIL) (SEQ (EXIT (PROGN (SPADLET |acc| (CONS (|trimString| - (SUBSTRING |u| (PLUS |i| 1) + (SUBSTRING |u| (+ |i| 1) (SPADDIFFERENCE (SPADDIFFERENCE |k| |i|) 1))) |acc|)) (SPADLET |i| |k|))))) (NREVERSE - (CONS (SUBSTRING |u| (PLUS |i| 1) + (CONS (SUBSTRING |u| (+ |i| 1) (SPADDIFFERENCE (SPADDIFFERENCE |m| |i|) 1)) |acc|)))))))))) @@ -859,7 +859,7 @@ ((> |i| |m|) |u|) ('T (SPADLET |j| |i|) (DO () - ((NULL (AND (> |m| (SPADLET |j| (PLUS |j| 1))) + ((NULL (AND (> |m| (SPADLET |j| (+ |j| 1))) (BOOT-EQUAL (ELT |u| |j|) (|char| '| |)))) NIL) @@ -871,7 +871,7 @@ "\\space{" (STRINGIMAGE |n|) "}" (|checkAddSpaceSegments| - (SUBSTRING |u| (PLUS |i| |n|) NIL) 0))) + (SUBSTRING |u| (+ |i| |n|) NIL) 0))) ('T (|checkAddSpaceSegments| |u| |j|)))))))))) ;checkTrim($x,lines) == main where @@ -901,13 +901,13 @@ (declare (special |$charBlank|)) (RETURN (SEQ (SPADLET |k| (|checkTrim,wherePP| |s|)) - (RETURN (SUBSTRING |s| (PLUS |k| 2) NIL)) - (SPADLET |m| (MAXINDEX |s|)) (SPADLET |n| (PLUS |k| 2)) - (DO ((|j| (PLUS |k| 2) (+ |j| 1))) + (RETURN (SUBSTRING |s| (+ |k| 2) NIL)) + (SPADLET |m| (MAXINDEX |s|)) (SPADLET |n| (+ |k| 2)) + (DO ((|j| (+ |k| 2) (+ |j| 1))) ((OR (> |j| |m|) (NULL (BOOT-EQUAL (ELT |s| |j|) |$charBlank|))) NIL) - (SEQ (EXIT (SPADLET |n| (PLUS |n| 1))))) + (SEQ (EXIT (SPADLET |n| (+ |n| 1))))) (EXIT (SUBSTRING |s| |n| NIL)))))) (DEFUN |checkTrim,wherePP| (|u|) @@ -917,8 +917,8 @@ (SEQ (SPADLET |k| (|charPosition| |$charPlus| |u| 0)) (IF (OR (BOOT-EQUAL |k| (|#| |u|)) (NEQUAL (|charPosition| |$charPlus| |u| - (PLUS |k| 1)) - (PLUS |k| 1))) + (+ |k| 1)) + (+ |k| 1))) (EXIT (|systemError| " Improper comment found"))) (EXIT |k|))))) @@ -1006,9 +1006,9 @@ (COND ((NEQUAL (SPADLET |k| (|firstNonBlankPosition| |u| - (PLUS |j| 1))) + (+ |j| 1))) (SPADDIFFERENCE 1)) - (CONS (SUBSTRING |u| (PLUS |j| 1) NIL) + (CONS (SUBSTRING |u| (+ |j| 1) NIL) (CDR |lines|))) ('T (CDR |lines|)))) (SPADLET |acc| NIL) @@ -1042,7 +1042,7 @@ (SPADLET |i| (|charPosition| (|char| '| |) |line| - (PLUS |k| 1)))) + (+ |k| 1)))) '|skip|) ('T (RETURN NIL))))) (SPADLET |acc| (CONS |line| |acc|)))))) @@ -1200,7 +1200,7 @@ "\\spadcommand" "\\footnote")) (SPADLET |spadflag| |count|)) ((BOOT-EQUAL |x| |$charLbrace|) - (SPADLET |count| (PLUS |count| 1))) + (SPADLET |count| (+ |count| 1))) ((BOOT-EQUAL |x| |$charRbrace|) (SPADLET |count| (SPADDIFFERENCE |count| 1)) @@ -1443,17 +1443,17 @@ (SPADLET |char| (ELT |s| |k|)) (COND ((BOOT-EQUAL |char| |$charBack|) - (SPADLET |k| (PLUS |k| 2))) + (SPADLET |k| (+ |k| 2))) ((member |char| |$charEscapeList|) (RETURN (SPADLET |insertIndex| |k|)))))) - (SPADLET |k| (PLUS |k| 1)))))) + (SPADLET |k| (+ |k| 1)))))) (COND (|insertIndex| (|checkAddBackSlashes| (STRCONC (SUBSTRING |s| 0 |insertIndex|) |$charBack| (ELT |s| |k|) - (SUBSTRING |s| (PLUS |insertIndex| 1) + (SUBSTRING |s| (+ |insertIndex| 1) NIL)))) ('T |s|)))))))) @@ -1599,7 +1599,7 @@ (COND ((> |m| (SPADLET |k| (|charPosition| |$charBack| |x| 0))) (COND - ((OR (EQL |m| 1) (ALPHA-CHAR-P (ELT |x| (PLUS |k| 1)))) + ((OR (EQL |m| 1) (ALPHA-CHAR-P (ELT |x| (+ |k| 1)))) (COND ((> |m| (SPADLET |k| (|charPosition| |$charBack| |x| 1))) @@ -1612,13 +1612,13 @@ ('T (SPADLET |u| (SUBSTRING |x| 0 |k|)) (SPADLET |v| (SUBSTRING |x| |k| 2)) (COND - ((BOOT-EQUAL (PLUS |k| 1) |m|) + ((BOOT-EQUAL (+ |k| 1) |m|) (CONS |u| (CONS |v| NIL))) ('T (CONS |u| (CONS |v| (|checkSplitBackslash| - (SUBSTRING |x| (PLUS |k| 2) NIL))))))))) + (SUBSTRING |x| (+ |k| 2) NIL))))))))) ('T (CONS |x| NIL)))))))) ;checkSplitPunctuation x == @@ -1700,7 +1700,7 @@ (APPEND (|checkSplitPunctuation| |u|) (|checkSplitPunctuation| |v|))))) ((> |m| (SPADLET |k| (|charPosition| |$charDash| |x| 1))) - (SPADLET |u| (SUBSTRING |x| (PLUS |k| 1) NIL)) + (SPADLET |u| (SUBSTRING |x| (+ |k| 1) NIL)) (CONS (SUBSTRING |x| 0 |k|) (CONS |$charDash| (|checkSplitPunctuation| |u|)))) ('T (CONS |x| NIL)))))))))) @@ -1763,7 +1763,7 @@ (CONS (SUBSTRING |x| 0 |k|) (CONS |char| (|checkSplitOn| - (SUBSTRING |x| (PLUS |k| 1) NIL)))))))))))) + (SUBSTRING |x| (+ |k| 1) NIL)))))))))))) ;checkInteger s == ; CHARP s => false diff --git a/src/interp/c-util.lisp.pamphlet b/src/interp/c-util.lisp.pamphlet index 0c68f7a..65e3560 100644 --- a/src/interp/c-util.lisp.pamphlet +++ b/src/interp/c-util.lisp.pamphlet @@ -102,7 +102,7 @@ (DEFUN |down| () (declare (special |$level|)) - (|displayComp| (SPADLET |$level| (PLUS |$level| 1)))) + (|displayComp| (SPADLET |$level| (+ |$level| 1)))) ; ;displaySemanticErrors() == @@ -1562,7 +1562,7 @@ ((OR (ATOM G3401) (PROGN (SETQ |u| (CAR G3401)) NIL)) NIL) - (SEQ (EXIT (|adjExitLevel| |u| (PLUS |seqnum| 1) |inc|))))) + (SEQ (EXIT (|adjExitLevel| |u| (+ |seqnum| 1) |inc|))))) ((AND (CONSP |x|) (EQ (QCAR |x|) '|exit|) (PROGN (SPADLET |ISTMP#1| (QCDR |x|)) @@ -1578,7 +1578,7 @@ (|adjExitLevel| |u| |seqnum| |inc|) (COND ((> |seqnum| |n|) |x|) - ('T (|rplac| (CADR |x|) (PLUS |n| |inc|))))) + ('T (|rplac| (CADR |x|) (+ |n| |inc|))))) ((AND (CONSP |x|) (PROGN (SPADLET |op| (QCAR |x|)) @@ -1691,7 +1691,7 @@ (DEFUN |genDomainVar| () (declare (special |$Index|)) (PROGN - (SPADLET |$Index| (PLUS |$Index| 1)) + (SPADLET |$Index| (+ |$Index| 1)) (INTERNL (STRCONC '|#D| (STRINGIMAGE |$Index|))))) ; @@ -1704,7 +1704,7 @@ (declare (special |$genSDVar|)) (INTERNL (STRCONC '|#G| (STRINGIMAGE - (SPADLET |$genSDVar| (PLUS |$genSDVar| 1)))))) + (SPADLET |$genSDVar| (+ |$genSDVar| 1)))))) ; ;genSomeVariable() == @@ -1716,7 +1716,7 @@ (declare (special |$genSDVar|)) (INTERNL (STRCONC '|##| (STRINGIMAGE - (SPADLET |$genSDVar| (PLUS |$genSDVar| 1)))))) + (SPADLET |$genSDVar| (+ |$genSDVar| 1)))))) ; ;listOfIdentifiersIn x == @@ -1781,9 +1781,9 @@ (DEFUN |numOfOccurencesOf,fn| (|x| |y| |n|) (SEQ (IF (NULL |y|) (EXIT 0)) - (IF (BOOT-EQUAL |x| |y|) (EXIT (PLUS |n| 1))) + (IF (BOOT-EQUAL |x| |y|) (EXIT (+ |n| 1))) (IF (ATOM |y|) (EXIT |n|)) - (EXIT (PLUS (|numOfOccurencesOf,fn| |x| (CAR |y|) |n|) + (EXIT (+ (|numOfOccurencesOf,fn| |x| (CAR |y|) |n|) (|numOfOccurencesOf,fn| |x| (CDR |y|) |n|))))) ;;; *** |numOfOccurencesOf| REDEFINED @@ -2057,7 +2057,7 @@ (SPADLET |d| (CADR G3644)) (SPADLET |a| (CAR G3635)) (SPADLET |b| (CADR G3635)) - (CONS (PLUS |a| |c|) (CONS (PLUS |b| |d|) NIL)))))) + (CONS (+ |a| |c|) (CONS (+ |b| |d|) NIL)))))) ; ;printStats [byteCount,elapsedSeconds] == diff --git a/src/interp/category.lisp.pamphlet b/src/interp/category.lisp.pamphlet index b937658..8bc12d2 100644 --- a/src/interp/category.lisp.pamphlet +++ b/src/interp/category.lisp.pamphlet @@ -375,7 +375,7 @@ of category object. (CONS |nsig| |count|) |NSigList|)) (SPADLET |count| - (PLUS |count| 1)) + (+ |count| 1)) |nsig|))) ('T |s|)) G166221)))))))) @@ -403,7 +403,7 @@ of category object. (SPADLET |OldLocals| (CONS (CONS |u| |count|) |OldLocals|)) - (SPADLET |count| (PLUS |count| 1)))))) + (SPADLET |count| (+ |count| 1)))))) (SPADLET |v| (make-array |count|)) (SETELT |v| 0 NIL) (SETELT |v| 1 |sigList|) @@ -2197,7 +2197,7 @@ copy. |FundamentalAncestors|)) (SPADLET |$NewCatVec| (LENGTHENVEC |$NewCatVec| - (PLUS |n| 1))) + (+ |n| 1))) (SPADLET |copied| NIL) (SPADLET |originalvector| NIL) (SETELT |$NewCatVec| |n| diff --git a/src/interp/clam.lisp.pamphlet b/src/interp/clam.lisp.pamphlet index 575f36a..36e5cbb 100644 --- a/src/interp/clam.lisp.pamphlet +++ b/src/interp/clam.lisp.pamphlet @@ -1189,7 +1189,7 @@ (AND (CONSP |x|) (EQUAL (QCAR |x|) '|$failed|))))) G2595) - (SEQ (EXIT (SETQ G2595 (PLUS G2595 1)))))))) + (SEQ (EXIT (SETQ G2595 (+ G2595 1)))))))) (|sayBrightly| (CONS |fn| (CONS "has" @@ -1264,7 +1264,7 @@ NIL) (SEQ (EXIT (COND ((SPADLET |u| (|assoc| |count| |al|)) - (RPLACD |u| (PLUS 1 (CDR |u|)))) + (RPLACD |u| (+ 1 (CDR |u|)))) ('T (COND ((AND (INTEGERP @@ -1344,7 +1344,7 @@ NIL) (SEQ (EXIT (COND ((SPADLET |u| (|assoc| |count| |al|)) - (RPLACD |u| (PLUS 1 (CDR |u|)))) + (RPLACD |u| (+ 1 (CDR |u|)))) ('T (SPADLET |al| (CONS (CONS |count| 1) |al|))))))) @@ -1666,7 +1666,7 @@ ((OR (ATOM |x|) (NULL (NE |x| |cache|))) NIL) (SEQ (EXIT (COND ((BOOT-EQUAL (CAAR |x|) '|$failed|) - (SPADLET |count| (PLUS |count| 1))) + (SPADLET |count| (+ |count| 1))) ('T NIL))))) |count|))))) @@ -1830,7 +1830,7 @@ (COND ((BOOT-EQUAL |$insideCoerceInteractive| 'T) (SPADLET |$instantCoerceCount| - (PLUS 1 |$instantCoerceCount|)))) + (+ 1 |$instantCoerceCount|)))) (COND ((AND (CONSP |$insideCanCoerceFrom|) (PROGN @@ -1840,7 +1840,7 @@ (PROGN (SPADLET |m2| (QCAR |ISTMP#1|)) 'T))) (NULL |dropIfTrue|)) (SPADLET |$instantCanCoerceCount| - (PLUS 1 |$instantCanCoerceCount|)) + (+ 1 |$instantCanCoerceCount|)) (SPADLET |xtra| (CONS " for " (CONS (|outputDomainConstructor| |m1|) @@ -1852,7 +1852,7 @@ ((AND (BOOT-EQUAL |$insideEvalMmCondIfTrue| 'T) (NULL |dropIfTrue|)) (SPADLET |$instantMmCondCount| - (PLUS |$instantMmCondCount| 1)))) + (+ |$instantMmCondCount| 1)))) (|typeTimePrin| (CONS 'CONCAT (CONS (|outputDomainConstructor| @@ -1864,8 +1864,8 @@ (COND ((SPADLET |v| (LASSOC |prop| |u|)) (COND - (|dropIfTrue| (RPLAC (CDR |v|) (PLUS 1 (CDR |v|)))) - ('T (RPLAC (CAR |v|) (PLUS 1 (CAR |v|)))))) + (|dropIfTrue| (RPLAC (CDR |v|) (+ 1 (CDR |v|)))) + ('T (RPLAC (CAR |v|) (+ 1 (CAR |v|)))))) ('T (RPLACD |u| (CONS (CAR |u|) (CDR |u|))) (SPADLET |val| (COND @@ -1979,14 +1979,14 @@ NIL)) NIL) (SEQ (EXIT (PROGN - (SPADLET |nTotal| (PLUS |nTotal| |n|)) - (SPADLET |mTotal| (PLUS |mTotal| |m|)) + (SPADLET |nTotal| (+ |nTotal| |n|)) + (SPADLET |mTotal| (+ |mTotal| |m|)) (COND ((> |n| 1) (SPADLET |rTotal| (SPADDIFFERENCE - (PLUS |rTotal| |n|) 1)))) - (SPADLET |nForms| (PLUS |nForms| 1)) + (+ |rTotal| |n|) 1)))) + (SPADLET |nForms| (+ |nForms| 1)) (|typeTimePrin| (CONS 'CONCATB (CONS |n| diff --git a/src/interp/fortcall.lisp.pamphlet b/src/interp/fortcall.lisp.pamphlet index 973756d..322ea3a 100644 --- a/src/interp/fortcall.lisp.pamphlet +++ b/src/interp/fortcall.lisp.pamphlet @@ -1045,7 +1045,7 @@ (POSITION |u| |userArgs|) |aType|)) G166514)))))))) - (SPADLET |nilLst| (MAKE-LIST (PLUS (|#| |args|) 1))) + (SPADLET |nilLst| (MAKE-LIST (+ (|#| |args|) 1))) (SPADLET |decPar| (CONS (CONS '|$elt| (CONS '|Lisp| @@ -1735,7 +1735,7 @@ (ELT |fort| (TIMES 2 |i|)) (ELT |fort| - (PLUS + (+ (TIMES 2 |i|) 1))) G166843))))))) @@ -1762,7 +1762,7 @@ (PROGN (SPADLET |offset| (TIMES 2 - (PLUS + (+ (TIMES |c| (CAR |dims|)) |r|))) @@ -1771,7 +1771,7 @@ (CONS (ELT |fort| |offset|) (ELT |fort| - (PLUS |offset| 1))) + (+ |offset| 1))) |innerEls|)))))) (SPADLET |els| (CONS @@ -1865,7 +1865,7 @@ (CONS (|int2Bool| (ELT |fort| - (PLUS + (+ (TIMES |c| (CAR |dims|)) |r|))) @@ -1953,7 +1953,7 @@ (SPADLET |innerEls| (CONS (ELT |fort| - (PLUS + (+ (TIMES |c| (CAR |dims|)) |r|)) @@ -1997,8 +1997,8 @@ (EXIT (PROGN (SPADLET |offset| - (PLUS - (PLUS + (+ + (+ (TIMES |p| |jDim|) (TIMES |c| @@ -2735,7 +2735,7 @@ (NSUBST (CONS '|elt| (CONS |newVariable| - (CONS (PLUS |index| 1) NIL))) + (CONS (+ |index| 1) NIL))) (ELT |vars| |index|) |body|))))) (SPADLET |target| (CONS (CONS '|DoubleFloat| NIL) @@ -2853,14 +2853,14 @@ (NSUBST (CONS '|elt| (CONS |newVariable| - (CONS (PLUS |index| 1) NIL))) + (CONS (+ |index| 1) NIL))) (ELT |vars| |index|) |funBodies|)) (SPADLET |jacBodies| (NSUBST (CONS '|elt| (CONS |newVariable| - (CONS (PLUS |index| 1) NIL))) + (CONS (+ |index| 1) NIL))) (ELT |vars| |index|) |jacBodies|)))))) (SPADLET |target| @@ -2934,7 +2934,7 @@ (NSUBST (CONS '|elt| (CONS |newVariable| - (CONS (PLUS |index| 1) NIL))) + (CONS (+ |index| 1) NIL))) (ELT |vars| |index|) |funBodies|))))) (SPADLET |target| (CONS (CONS '|Vector| diff --git a/src/interp/functor.lisp.pamphlet b/src/interp/functor.lisp.pamphlet index 0718d53..1f96591 100644 --- a/src/interp/functor.lisp.pamphlet +++ b/src/interp/functor.lisp.pamphlet @@ -304,7 +304,7 @@ (SPADLET |name| (INTERNL (STRCONC "Where" (STRINGIMAGE |$WhereCounter|)))) - (SPADLET |$WhereCounter| (PLUS |$WhereCounter| 1)) + (SPADLET |$WhereCounter| (+ |$WhereCounter| 1)) |name|)))) ;PacPrint v == @@ -2268,7 +2268,7 @@ NIL)) (SETQ G167375 (CONS |u| G167375)))))))))) - (SPADLET |copyvec| (make-array (PLUS 1 |n|))) + (SPADLET |copyvec| (make-array (+ 1 |n|))) (DO ((G167387 |code| (CDR G167387)) (|u| NIL)) ((OR (ATOM G167387) (PROGN (SETQ |u| (CAR G167387)) NIL)) @@ -2292,25 +2292,25 @@ (PROGN (SPADLET |name| (CAR |u|)) (SPADLET |count| (CDR |u|)) - (SPADLET |j| (PLUS |i| 1)) + (SPADLET |j| (+ |i| 1)) (DO () ((NULL (AND (<= |j| - (MIN |n| (PLUS |i| 63))) + (MIN |n| (+ |i| 63))) (BOOT-EQUAL (LASSOC |name| (ELT |copyvec| |j|)) (SPADDIFFERENCE - (PLUS |count| |j|) |i|)))) + (+ |count| |j|) |i|)))) NIL) (SEQ (EXIT - (SPADLET |j| (PLUS |j| 1))))) + (SPADLET |j| (+ |j| 1))))) (SPADLET |j| (SPADDIFFERENCE |j| 1)) (COND - ((> |j| (PLUS |i| 2)) + ((> |j| (+ |i| 2)) (PROGN (DO ((|k| |i| (+ |k| 1))) ((> |k| |j|) NIL) @@ -2320,7 +2320,7 @@ (|delete| (CONS |name| (SPADDIFFERENCE - (PLUS |count| + (+ |count| |k|) |i|)) (ELT |copyvec| |k|)))))) @@ -2339,7 +2339,7 @@ (CONS (INTERN "END2" "KEYWORD") (CONS - (PLUS |j| 1) + (+ |j| 1) NIL))))))))) |code|))))))))) (COND diff --git a/src/interp/g-timer.lisp.pamphlet b/src/interp/g-timer.lisp.pamphlet index 286e8cc..6f0fa2e 100644 --- a/src/interp/g-timer.lisp.pamphlet +++ b/src/interp/g-timer.lisp.pamphlet @@ -52,7 +52,7 @@ NIL)) G166065) (SEQ (EXIT (SETQ G166065 - (PLUS G166065 + (+ G166065 (GETL |name| |property|))))))))) (DO ((G166086 |listofnames| (CDR G166086)) (G166061 NIL)) @@ -155,9 +155,9 @@ (LASSOC |class| |listofclasses|))) (SPADLET |n| (GETL |name| |property|)) (PUT |cl| |classproperty| - (PLUS |n| + (+ |n| (GETL |cl| |classproperty|))) - (SPADLET |total| (PLUS |total| |n|)) + (SPADLET |total| (+ |total| |n|)) (COND ((>= |n| 0.01) (SPADLET |timestr| @@ -165,7 +165,7 @@ |n|))) ('T (SPADLET |timestr| "") (SPADLET |otherStatTotal| - (PLUS |otherStatTotal| |n|)))) + (+ |otherStatTotal| |n|)))) (SPADLET |str| (|makeStatString| |str| |timestr| |ab| |flag|))))))) @@ -178,11 +178,11 @@ (|normalizeStatAndStringify| |otherStatTotal|) 'O |flag|)) - (SPADLET |total| (PLUS |total| |otherStatTotal|)) + (SPADLET |total| (+ |total| |otherStatTotal|)) (SPADLET |cl| (CAR (LASSOC '|other| |listofnames|))) (SPADLET |cl| (CAR (LASSOC |cl| |listofclasses|))) (PUT |cl| |classproperty| - (PLUS |otherStatTotal| + (+ |otherStatTotal| (GETL |cl| |classproperty|))))) (COND ((NEQUAL |flag| '|long|) (SPADLET |total| 0) @@ -205,7 +205,7 @@ (COND ((BOOT-EQUAL |n| 0.0) '|iterate|) ('T - (SPADLET |total| (PLUS |total| |n|)) + (SPADLET |total| (+ |total| |n|)) (SPADLET |timestr| (|normalizeStatAndStringify| |n|)) @@ -243,10 +243,10 @@ ((integerp |t|) (SPADLET K 1024) (SPADLET M (TIMES K K)) (COND ((> |t| (TIMES 9 M)) - (CONCAT (STRINGIMAGE (QUOTIENT (PLUS |t| (TIMES 512 K)) M)) + (CONCAT (STRINGIMAGE (QUOTIENT (+ |t| (TIMES 512 K)) M)) "M")) ((> |t| (TIMES 9 K)) - (CONCAT (STRINGIMAGE (QUOTIENT (PLUS |t| 512) K)) + (CONCAT (STRINGIMAGE (QUOTIENT (+ |t| 512) K)) "K")) ('T (STRINGIMAGE |t|)))) ('T (STRINGIMAGE |t|)))))) @@ -266,7 +266,7 @@ (DEFUN |roundStat| (|t|) (COND ((NULL (FLOATP |t|)) |t|) - ('T (QUOTIENT (truncate (PLUS 0.5 (TIMES |t| 1000.0))) 1000.0)))) + ('T (QUOTIENT (truncate (+ 0.5 (TIMES |t| 1000.0))) 1000.0)))) ;makeStatString(oldstr,time,abb,flag) == ; time = '"" => oldstr @@ -458,7 +458,7 @@ (RETURN (PROGN (SPADLET |count| - (PLUS (OR (GETL |name| '|TimeTotal|) 0) + (+ (OR (GETL |name| '|TimeTotal|) 0) (|computeElapsedTime|))) (PUT |name| '|TimeTotal| |count|))))) @@ -529,7 +529,7 @@ |gcDelta|)) |$timerTicksPerSecond|)) (PUT '|gc| '|TimeTotal| - (PLUS (GETL '|gc| '|TimeTotal|) + (+ (GETL '|gc| '|TimeTotal|) (QUOTIENT (TIMES 1.0 |gcDelta|) |$timerTicksPerSecond|))) (SPADLET |$oldElapsedTime| (|elapsedUserTime|)) diff --git a/src/interp/g-util.lisp.pamphlet b/src/interp/g-util.lisp.pamphlet index edbf0bc..9dd814b 100644 --- a/src/interp/g-util.lisp.pamphlet +++ b/src/interp/g-util.lisp.pamphlet @@ -326,7 +326,7 @@ (SEQ (EXIT (COND ((NEQUAL (SCHAR |str| |i|) '| |) (SPADLET |nb| |i|)) - ('T (SPADLET |i| (PLUS |i| 1))))))) + ('T (SPADLET |i| (+ |i| 1))))))) (COND ((EQL |nb| 0) |str|) (|nb| (SUBSTRING |str| |nb| NIL)) @@ -980,7 +980,7 @@ (DEFUN |position,posn| (|x| |l| |n|) (SEQ (IF (NULL |l|) (EXIT (SPADDIFFERENCE 1))) (IF (BOOT-EQUAL |x| (CAR |l|)) (EXIT |n|)) - (EXIT (|position,posn| |x| (CDR |l|) (PLUS |n| 1))))) + (EXIT (|position,posn| |x| (CDR |l|) (+ |n| 1))))) (DEFUN |position| (|x| |l|) (|position,posn| |x| |l| 0)) @@ -1042,7 +1042,7 @@ (NULL (BOOT-EQUAL (ELT |s| |i|) |$blank|))) NIL) (SEQ (EXIT (SPADLET |j| |i|)))) - (SUBSTRING |s| (PLUS |j| 1) NIL)) + (SUBSTRING |s| (+ |j| 1) NIL)) ('T |s|))))))) ;rightTrim s == -- assumed a non-empty string diff --git a/src/interp/hashcode.lisp.pamphlet b/src/interp/hashcode.lisp.pamphlet index 43d713f..f844c6a 100644 --- a/src/interp/hashcode.lisp.pamphlet +++ b/src/interp/hashcode.lisp.pamphlet @@ -196,7 +196,7 @@ (CHAR-CODE (|char| (ELT |str| |i|)))) (SPADLET |h| (LOGXOR |h| (ASH |h| 8))) - (SPADLET |h| (PLUS (PLUS |h| |j|) 200041)) + (SPADLET |h| (+ (+ |h| |j|) 200041)) (SPADLET |h| (LOGAND |h| 1073741823)))))) (REM |h| |$hashModulus|)))))) @@ -207,7 +207,7 @@ (DEFUN |hashCombine| (|hash1| |hash2|) (declare (special |$hashModulus|)) - (MOD (PLUS (ASH (LOGAND |hash2| 16777215) 6) |hash1|) |$hashModulus|)) + (MOD (+ (ASH (LOGAND |hash2| 16777215) 6) |hash1|) |$hashModulus|)) ;$VoidHash := hashString '"Void" ;-- following two lines correct bad coSig properties due to SubsetCategory diff --git a/src/interp/i-analy.lisp.pamphlet b/src/interp/i-analy.lisp.pamphlet index aa4bf1c..e0676fa 100644 --- a/src/interp/i-analy.lisp.pamphlet +++ b/src/interp/i-analy.lisp.pamphlet @@ -651,7 +651,7 @@ ((BOOT-EQUAL |targ| |arg|) (EXIT (SETELT |sameAsTarg| |i| - (PLUS 1 + (+ 1 (ELT |sameAsTarg| |i|)))))))))))) (SPADLET |ok| NIL) (DO ((G166433 (SPADDIFFERENCE |n| 1)) @@ -860,7 +860,7 @@ (PROGN (SPADLET |ms| (QCDR |ISTMP#1|)) 'T))) - (BOOT-EQUAL (PLUS |nargs| 1) (|#| |ms|))) + (BOOT-EQUAL (+ |nargs| 1) (|#| |ms|))) (DO ((G166489 (CDR |ms|) (CDR G166489)) (|m| NIL) (G166490 |argl| (CDR G166490)) diff --git a/src/interp/i-coerce.lisp.pamphlet b/src/interp/i-coerce.lisp.pamphlet index 3570610..3ba67b8 100644 --- a/src/interp/i-coerce.lisp.pamphlet +++ b/src/interp/i-coerce.lisp.pamphlet @@ -3935,7 +3935,7 @@ Interpreter Coercion Query Functions (SEQ (IF (>= |start| |len|) (EXIT |l|)) (IF (|member| |start| |l|) (EXIT (|computeTTTranspositions,compress| |l| - (PLUS |start| 1) |len|))) + (+ |start| 1) |len|))) (EXIT (|computeTTTranspositions,compress| (PROG (G168121) (SPADLET G168121 NIL) @@ -4107,12 +4107,12 @@ Interpreter Coercion Query Functions ((<= |r| 0) NIL) ((EQL |r| 1) (COND - ((> (ELT |p| (PLUS |r| 1)) (ELT |p| |r|)) NIL) - ('T (CONS (CONS |r| (PLUS |r| 1)) NIL)))) + ((> (ELT |p| (+ |r| 1)) (ELT |p| |r|)) NIL) + ('T (CONS (CONS |r| (+ |r| 1)) NIL)))) ((BOOT-EQUAL (ELT |p| |start|) |start|) - (|permuteToOrder| |p| |n| (PLUS |start| 1))) + (|permuteToOrder| |p| |n| (+ |start| 1))) ('T (SPADLET |stpos| NIL) - (DO ((|i| (PLUS |start| 1) (+ |i| 1))) + (DO ((|i| (+ |start| 1) (+ |i| 1))) ((OR (> |i| |n|) (NULL (NULL |stpos|))) NIL) (SEQ (EXIT (COND ((BOOT-EQUAL (ELT |p| |i|) |start|) @@ -4130,7 +4130,7 @@ Interpreter Coercion Query Functions (SETELT |p| |x| |t|) (SPADLET |stpos| |x|))))) (APPEND (NREVERSE |perms|) - (|permuteToOrder| |p| |n| (PLUS |start| 1)))))))))) + (|permuteToOrder| |p| |n| (+ |start| 1)))))))))) ;coerceIntTest(t1,t2) == ; -- looks whether there exists a table entry or a coercion function diff --git a/src/interp/i-coerfn.lisp.pamphlet b/src/interp/i-coerfn.lisp.pamphlet index 2b809f7..27ac07c 100755 --- a/src/interp/i-coerfn.lisp.pamphlet +++ b/src/interp/i-coerfn.lisp.pamphlet @@ -83,7 +83,7 @@ all these coercion functions have the following result: ; -- this is used where we want to assume a 1-based index ; 1 + position(x,y) -(DEFUN |position1| (|x| |y|) (PLUS 1 (|position| |x| |y|))) +(DEFUN |position1| (|x| |y|) (+ 1 (|position| |x| |y|))) ;--% Direct Product, New and Old ;DP2DP(u,source is [.,n,S],target is [.,m,T]) == @@ -746,8 +746,8 @@ all these coercion functions have the following result: (RETURN (SEQ (PROGN (SPADLET |vl'| (REVERSE (MSORT |vl|))) - (SPADLET |n| (PLUS (SPADDIFFERENCE 1) (|#| |vl|))) - (SPADLET |pos| (LIST2VEC (|LZeros| (PLUS |n| 1)))) + (SPADLET |n| (+ (SPADDIFFERENCE 1) (|#| |vl|))) + (SPADLET |pos| (LIST2VEC (|LZeros| (+ |n| 1)))) (DO ((|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| |n|) NIL) (SEQ (EXIT (SETELT |pos| |i| (|position| (ELT |vl| |i|) |vl'|))))) @@ -764,7 +764,7 @@ all these coercion functions have the following result: NIL) (SEQ (EXIT (PROGN (SPADLET |e'| - (LIST2VEC (|LZeros| (PLUS |n| 1)))) + (LIST2VEC (|LZeros| (+ |n| 1)))) (DO ((|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| |n|) NIL) (SEQ (EXIT @@ -1133,7 +1133,7 @@ all these coercion functions have the following result: (RETURN (DO ((G166957 NIL (NULL G166951)) (G166958 - (PLUS (SPADDIFFERENCE 1) (|#| |vl|))) + (+ (SPADDIFFERENCE 1) (|#| |vl|))) (|i| 0 (QSADD1 |i|))) ((OR G166957 (QSGREATERP |i| G166958)) G166951) @@ -1614,7 +1614,7 @@ all these coercion functions have the following result: (SETELT |vec| |index| |e|) (SPADLET |summands| (|Expr2Dmp1| |summands| |vec| - |c| T$ (PLUS |index| 1) + |c| T$ (+ |index| 1) (CDR |varList|) T$)))))))) |summands|))))) @@ -3281,16 +3281,16 @@ all these coercion functions have the following result: ((> |i| G168566) NIL) (SEQ (EXIT (COND ((EQL (ELT |e| |i|) 0) - (SPADLET |patlen| (PLUS |patlen| 1))) + (SPADLET |patlen| (+ |patlen| 1))) ('T (RETURN NIL)))))) (COND ((>= |patlen| |numexps|) (CONS 0 |c|)) ('T (CONS 1 - (CONS (PLUS 1 |patlen|) + (CONS (+ 1 |patlen|) (CONS (CONS (ELT |e| |patlen|) (|genMpFromDmpTerm| |u| - (PLUS |patlen| 1))) + (+ |patlen| 1))) NIL)))))))))))) ;Mp2P(u, source is [mp,vl, S], target is [p,R]) == diff --git a/src/interp/i-funsel.lisp.pamphlet b/src/interp/i-funsel.lisp.pamphlet index 18ec6ef..e597748 100644 --- a/src/interp/i-funsel.lisp.pamphlet +++ b/src/interp/i-funsel.lisp.pamphlet @@ -1871,7 +1871,7 @@ |cond|) (EXIT (SETELT |v| |i| - (PLUS 1 (ELT |v| |i|)))))))))))) + (+ 1 (ELT |v| |i|)))))))))))) (EXIT |v|)))))))))))) ;CONTAINEDisDomain(symbol,cond) == @@ -2131,7 +2131,7 @@ the types A and B themselves are not sorted by preference. (SPADDIFFERENCE |cost| 2)) ((BOOT-EQUAL |res| |$NonNegativeInteger|) (SPADDIFFERENCE |cost| 1)) - ((BOOT-EQUAL |res| |$DoubleFloat|) (PLUS |cost| 1)) + ((BOOT-EQUAL |res| |$DoubleFloat|) (+ |cost| 1)) (t (COND (|$reportBottomUpFlag| @@ -2219,7 +2219,7 @@ the types A and B themselves are not sorted by preference. NIL)) NIL) (SEQ (EXIT (setq |n| - (PLUS |n| + (+ |n| (COND ((|isEqualOrSubDomain| |x1| |x3|) @@ -2238,13 +2238,13 @@ the types A and B themselves are not sorted by preference. '|Mapping|) 2) (t 4)))))))))) - (|sigArgs| (setq |n| (PLUS |n| 100000000000))) + (|sigArgs| (setq |n| (+ |n| 100000000000))) (t NIL)) (setq |res| (CADR |sig|)) (COND ((BOOT-EQUAL |res| |tar|) (TIMES 10000 |n|)) (t - (PLUS (PLUS (TIMES 10000 |n|) + (+ (+ (TIMES 10000 |n|) (TIMES 1000 (|domainDepth| |res|))) (|hitListOfTarget| |res|))))))))) @@ -2434,7 +2434,7 @@ the types A and B themselves are not sorted by preference. (COND ((NULL |mmList|) NIL) (t (setq |gotOne| NIL) - (setq |nargs| (PLUS |nargs| 1)) + (setq |nargs| (+ |nargs| 1)) (SEQ (DO ((G167207 (CDR |mmList|) (CDR G167207)) (|mm| NIL)) ((OR (ATOM G167207) @@ -2483,7 +2483,7 @@ the types A and B themselves are not sorted by preference. (COND ((NULL |mmList|) NIL) (t (setq |gotOne| NIL) - (setq |nargs| (PLUS |nargs| 1)) (setq |vec| NIL) + (setq |nargs| (+ |nargs| 1)) (setq |vec| NIL) (SEQ (DO ((G167227 (CDR |mmList|) (CDR G167227)) (|mm| NIL)) ((OR (ATOM G167227) diff --git a/src/interp/i-map.lisp.pamphlet b/src/interp/i-map.lisp.pamphlet index ec73f51..063fb90 100644 --- a/src/interp/i-map.lisp.pamphlet +++ b/src/interp/i-map.lisp.pamphlet @@ -2577,7 +2577,7 @@ (SPADLET |newName| (|makeInternalMapName| |op| (SPADDIFFERENCE (|#| |sig|) 1) - (PLUS 1 (|#| |currentMms|)) NIL)) + (+ 1 (|#| |currentMms|)) NIL)) (SPADLET |newMm| (CONS (CONS '|local| |sig|) (CONS |newName| (CONS NIL NIL)))) @@ -2884,7 +2884,7 @@ ('T 0))) (COND ((|member| |op| |opList|) |argc|) - ((BOOT-EQUAL |op| |opName|) (PLUS 1 |argc|)) + ((BOOT-EQUAL |op| |opName|) (+ 1 |argc|)) ((AND (SPADLET |obj| (|get| |op| '|value| |$e|)) (PROGN (SPADLET |ISTMP#1| (|objVal| |obj|)) @@ -2893,7 +2893,7 @@ (PROGN (SPADLET |mapDef| (QCDR |ISTMP#1|)) 'T)))) - (PLUS (|mapRecurDepth| |opName| (CONS |op| |opList|) + (+ (|mapRecurDepth| |opName| (CONS |op| |opList|) (|getMapBody| |op| |mapDef|)) |argc|)) ('T |argc|))) @@ -3703,7 +3703,7 @@ ('T (CONS '|and| (CONS (|mkValCheck| (CAR |vals|) |i|) - (CONS (|mkValueCheck| (CDR |vals|) (PLUS |i| 1)) + (CONS (|mkValueCheck| (CDR |vals|) (+ |i| 1)) NIL)))))))) ;mkValCheck(val,i) == diff --git a/src/interp/i-output.lisp.pamphlet b/src/interp/i-output.lisp.pamphlet index b524a5b..e1d3e9f 100644 --- a/src/interp/i-output.lisp.pamphlet +++ b/src/interp/i-output.lisp.pamphlet @@ -71,7 +71,7 @@ (AND (CONSP |ISTMP#1|) (EQ (QCDR |ISTMP#1|) NIL) (PROGN (SPADLET |u| (QCAR |ISTMP#1|)) 'T)))) (THROW '|outputFailure| '|outputFailure|)) - (PLUS 2 (|#| |u|)))))) + (+ 2 (|#| |u|)))))) ;obj2String o == ; atom o => @@ -137,10 +137,10 @@ (SPADLET |s| (GETL |op| 'PREFIXOP))) (COND ((GETL |op| '|isSuffix|) - (|appChar| |s| (PLUS |x| (WIDTH |a|)) |y| + (|appChar| |s| (+ |x| (WIDTH |a|)) |y| (APP |a| |x| |y| |d|))) ('T - (APP |a| (PLUS |x| (|#| |s|)) |y| + (APP |a| (+ |x| (|#| |s|)) |y| (|appChar| |s| |x| |y| |d|))))) ((AND (CONSP |u|) (PROGN @@ -222,20 +222,20 @@ these functions return an updated ``layout so far'' in general (SETELT |string| 1 (EBCDIC 65)))))) (SPADLET |shiftedX| (COND - ((EQL |y| 0) (PLUS |x| |$highlightDelta|)) + ((EQL |y| 0) (+ |x| |$highlightDelta|)) ('T |x|))) (RPLACSTR |line| |shiftedX| (SPADLET |n| (|#| |string|)) |string| 0 |n|) (COND ((BOOT-EQUAL |bumpDeltaIfTrue| 'T) - (SPADLET |$highlightDelta| (PLUS |$highlightDelta| 1)))) + (SPADLET |$highlightDelta| (+ |$highlightDelta| 1)))) |d|) ('T (|appChar| |string| |x| |y| (NCONC |d| (CONS (CONS |y| (make-full-cvec - (PLUS (PLUS 10 $LINELENGTH) + (+ (+ 10 $LINELENGTH) $MARGIN) '| |)) NIL))))))))) @@ -1742,7 +1742,7 @@ NIL (BOOT-EQUAL |op| 'ROOT) (EQL (|subspan| |arg|) 1)))) (SPADLET |d| (APP BLANK |x| |y| |d|)) - (SPADLET |x| (PLUS |x| 1)))) + (SPADLET |x| (+ |x| 1)))) (SPADLET |LETTMP#1| (|appInfixArg| |arg| |x| |y| |d| |rightPrec| '|left| NIL)) @@ -1798,17 +1798,17 @@ NIL (SPADLET |one| (CADDDR G167334)) (SPADLET |optFinal| (CDDDDR G167334)) (SPADLET |d| (|appChar| "for " |x| |y| |d|)) - (SPADLET |d| (APP |a| (SPADLET |w| (PLUS |x| 4)) |y| |d|)) + (SPADLET |d| (APP |a| (SPADLET |w| (+ |x| 4)) |y| |d|)) (SPADLET |d| - (|appChar| " in " (SPADLET |w| (PLUS |w| (WIDTH |a|))) + (|appChar| " in " (SPADLET |w| (+ |w| (WIDTH |a|))) |y| |d|)) - (SPADLET |d| (APP |init| (SPADLET |w| (PLUS |w| 4)) |y| |d|)) + (SPADLET |d| (APP |init| (SPADLET |w| (+ |w| 4)) |y| |d|)) (SPADLET |d| - (APP ".." (SPADLET |w| (PLUS |w| (WIDTH |init|))) |y| + (APP ".." (SPADLET |w| (+ |w| (WIDTH |init|))) |y| |d|)) (COND (|optFinal| - (SPADLET |d| (APP (CAR |optFinal|) (PLUS |w| 2) |y| |d|)))) + (SPADLET |d| (APP (CAR |optFinal|) (+ |w| 2) |y| |d|)))) |d|)))) ;stepSub [.,a,init,one,:optFinal] == @@ -1858,7 +1858,7 @@ NIL (SPADLET |init| (CADDR G167409)) (SPADLET |one| (CADDDR G167409)) (SPADLET |optFinal| (CDDDDR G167409)) - (PLUS (PLUS (PLUS 10 (WIDTH |a|)) (WIDTH |init|)) + (+ (+ (+ 10 (WIDTH |a|)) (WIDTH |init|)) (COND (|optFinal| (WIDTH (CAR |optFinal|))) ('T 0))))))) ;inApp([.,a,s],x,y,d) == --for [IN,a,s] @@ -1874,11 +1874,11 @@ NIL (SPADLET |a| (CADR G167430)) (SPADLET |s| (CADDR G167430)) (SPADLET |d| (|appChar| "for " |x| |y| |d|)) - (SPADLET |d| (APP |a| (PLUS |x| 4) |y| |d|)) + (SPADLET |d| (APP |a| (+ |x| 4) |y| |d|)) (SPADLET |d| - (|appChar| " in " (PLUS (PLUS |x| (WIDTH |a|)) 4) |y| + (|appChar| " in " (+ (+ |x| (WIDTH |a|)) 4) |y| |d|)) - (APP |s| (PLUS (PLUS |x| (WIDTH |a|)) 8) |y| |d|))))) + (APP |s| (+ (+ |x| (WIDTH |a|)) 8) |y| |d|))))) ;inSub [.,a,s] == MAX(subspan a,subspan s) @@ -1908,7 +1908,7 @@ NIL (PROGN (SPADLET |a| (CADR G167475)) (SPADLET |s| (CADDR G167475)) - (PLUS (PLUS 8 (WIDTH |a|)) (WIDTH |s|)))))) + (+ (+ 8 (WIDTH |a|)) (WIDTH |s|)))))) ;centerApp([.,u],x,y,d) == ; d := APP(u,x,y,d) @@ -1951,7 +1951,7 @@ NIL NIL) (SEQ (EXIT (PROGN (SPADLET |d| (APP |u| |x| |y| |d|)) - (SPADLET |x| (PLUS (PLUS |x| (WIDTH |u|)) |n|)))))) + (SPADLET |x| (+ (+ |x| (WIDTH |u|)) |n|)))))) |d|))) ;concatSub [.,:l] == "MAX"/[subspan x for x in l] @@ -2002,7 +2002,7 @@ NIL ((OR (ATOM G167599) (PROGN (SETQ |x| (CAR G167599)) NIL)) G167594) - (SEQ (EXIT (SETQ G167594 (PLUS G167594 (WIDTH |x|))))))))))))) + (SEQ (EXIT (SETQ G167594 (+ G167594 (WIDTH |x|))))))))))))) ;concatbWidth [.,:l] == +/[1+WIDTH x for x in l]-1 @@ -2020,8 +2020,8 @@ NIL (PROGN (SETQ |x| (CAR G167622)) NIL)) G167617) (SEQ (EXIT (SETQ G167617 - (PLUS G167617 - (PLUS 1 (WIDTH |x|))))))))) + (+ G167617 + (+ 1 (WIDTH |x|))))))))) 1)))))) ;exptApp([.,a,b],x,y,d) == @@ -2045,9 +2045,9 @@ NIL (|pren| (|appparu| |a| |x| |y| |d|)) ('T (APP |a| |x| |y| |d|)))) (SPADLET |x'| - (PLUS (PLUS |x| (WIDTH |a|)) (COND (|pren| 2) ('T 0)))) + (+ (+ |x| (WIDTH |a|)) (COND (|pren| 2) ('T 0)))) (SPADLET |y'| - (PLUS (PLUS (PLUS (PLUS 1 |y|) (|superspan| |a|)) + (+ (+ (+ (+ 1 |y|) (|superspan| |a|)) (|subspan| |b|)) (COND ((EQL 0 (|superspan| |a|)) 0) @@ -2087,7 +2087,7 @@ NIL (PROGN (SPADLET |a| (CADR G167664)) (SPADLET |b| (CADDR G167664)) - (PLUS (PLUS (|superspan| |a|) (|height| |b|)) + (+ (+ (|superspan| |a|) (|height| |b|)) (COND ((EQL (|superspan| |a|) 0) 0) ('T (SPADDIFFERENCE 1)))))))) @@ -2100,7 +2100,7 @@ NIL (PROGN (SPADLET |a| (CADR G167679)) (SPADLET |b| (CADDR G167679)) - (PLUS (PLUS (WIDTH |a|) (WIDTH |b|)) + (+ (+ (WIDTH |a|) (WIDTH |b|)) (COND ((|exptNeedsPren| |a|) 2) ('T 0))))))) ;needStar(wasSimple,wasQuotient,wasNumber,cur,op) == @@ -2168,12 +2168,12 @@ NIL (|needStar| |wasSimple| |wasQuotient| |wasNumber| |arg| |op|)) - (SPADLET |w| (PLUS |w| 1)))) + (SPADLET |w| (+ |w| 1)))) (COND ((|infixArgNeedsParens| |arg| |rightPrec| '|left|) - (SPADLET |w| (PLUS |w| 2)))) - (SPADLET |w| (PLUS |w| (WIDTH |arg|))) + (SPADLET |w| (+ |w| 2)))) + (SPADLET |w| (+ |w| (WIDTH |arg|))) (SPADLET |wasSimple| (AND (ATOM |arg|) (NULL (NUMBERP |arg|)))) @@ -2191,7 +2191,7 @@ NIL (PROGN (SPADLET |frst| (CADR G167733)) (SPADLET |rst| (CDDR G167733)) - (|appSum| |rst| (PLUS |x| (WIDTH |frst|)) |y| + (|appSum| |rst| (+ |x| (WIDTH |frst|)) |y| (APP |frst| |x| |y| |d|)))))) ;appSum(u,x,y,d) == @@ -2231,7 +2231,7 @@ NIL (OR (GETL |infixOp| 'INFIXOP) ",")) (SPADLET |d| (APP |opString| |x| |y| |d|)) - (SPADLET |x| (PLUS |x| (WIDTH |opString|))) + (SPADLET |x| (+ |x| (WIDTH |opString|))) (SPADLET |arg| (|absym| |arg|)) (SPADLET |rightPrec| (|getOpBindingPower| |infixOp| @@ -2239,7 +2239,7 @@ NIL (COND ((BOOT-EQUAL |infixOp| '-) (SPADLET |rightPrec| - (PLUS |rightPrec| 1)))) + (+ |rightPrec| 1)))) (SPADLET |LETTMP#1| (|appInfixArg| |arg| |x| |y| |d| |rightPrec| '|left| NIL)) @@ -2322,7 +2322,7 @@ NIL (SPADLET |d| (|appChar| |opString| |x| |y| |d|)) - (SPADLET |x| (PLUS |x| |opWidth|)) + (SPADLET |x| (+ |x| |opWidth|)) (SPADLET |LETTMP#1| (|appInfixArg| |arg| |x| |y| |d| |rightPrec| '|left| |opString|)) @@ -2340,7 +2340,7 @@ NIL ; prec > getBindingPowerOf(leftOrRight, arg) + 1 (DEFUN |infixArgNeedsParens| (|arg| |prec| |leftOrRight|) - (> |prec| (PLUS (|getBindingPowerOf| |leftOrRight| |arg|) 1))) + (> |prec| (+ (|getBindingPowerOf| |leftOrRight| |arg|) 1))) ;appInfixArg(u,x,y,d,prec,leftOrRight,string) == ; insertPrensIfTrue:= infixArgNeedsParens(u,prec,leftOrRight) @@ -2361,11 +2361,11 @@ NIL (COND (|insertPrensIfTrue| (|appparu| |u| |x| |y| |d|)) ('T (APP |u| |x| |y| |d|)))) - (SPADLET |x| (PLUS |x| (WIDTH |u|))) + (SPADLET |x| (+ |x| (WIDTH |u|))) (COND (|string| (SPADLET |d| (|appconc| |d| |x| |y| |string|)))) (CONS |d| - (CONS (COND (|insertPrensIfTrue| (PLUS |x| 2)) ('T |x|)) + (CONS (COND (|insertPrensIfTrue| (+ |x| 2)) ('T |x|)) NIL)))))) ;getBindingPowerOf(key,x) == @@ -2490,9 +2490,9 @@ NIL (PROGN (SPADLET |u| (QCAR |ISTMP#1|)) 'T)))) (THROW '|outputFailure| '|outputFailure|)) (SPADLET |d| (|appChar| (|specialChar| '|lbrk|) |x| |y| |d|)) - (SPADLET |d| (APP |u| (PLUS |x| 1) |y| |d|)) + (SPADLET |d| (APP |u| (+ |x| 1) |y| |d|)) (|appChar| (|specialChar| '|rbrk|) - (PLUS (PLUS |x| 1) (WIDTH |u|)) |y| |d|))))) + (+ (+ |x| 1) (WIDTH |u|)) |y| |d|))))) ;--% Braces ;braceApp(u,x,y,d) == @@ -2512,9 +2512,9 @@ NIL (PROGN (SPADLET |u| (QCAR |ISTMP#1|)) 'T)))) (THROW '|outputFailure| '|outputFailure|)) (SPADLET |d| (|appChar| (|specialChar| '|lbrc|) |x| |y| |d|)) - (SPADLET |d| (APP |u| (PLUS |x| 1) |y| |d|)) + (SPADLET |d| (APP |u| (+ |x| 1) |y| |d|)) (|appChar| (|specialChar| '|rbrc|) - (PLUS (PLUS |x| 1) (WIDTH |u|)) |y| |d|))))) + (+ (+ |x| 1) (WIDTH |u|)) |y| |d|))))) ;--% Aggregates ;aggWidth u == @@ -2532,7 +2532,7 @@ NIL (SPADLET |a| (QCAR |ISTMP#1|)) (SPADLET |l| (QCDR |ISTMP#1|)) 'T))) - (PLUS (WIDTH |a|) + (+ (WIDTH |a|) (PROG (G167935) (SPADLET G167935 0) (RETURN @@ -2541,8 +2541,8 @@ NIL (PROGN (SETQ |x| (CAR G167940)) NIL)) G167935) (SEQ (EXIT (SETQ G167935 - (PLUS G167935 - (PLUS 1 (WIDTH |x|))))))))))) + (+ G167935 + (+ 1 (WIDTH |x|))))))))))) ('T 0)))))) ;aggSub u == subspan rest u @@ -2579,7 +2579,7 @@ NIL (SPADLET |l| (QCDR |u|)) 'T)) (SPADLET |d| (APP |a| |x| |y| |d|)) - (SPADLET |x| (PLUS |x| (WIDTH |a|))) + (SPADLET |x| (+ |x| (WIDTH |a|))) (DO ((G167974 |l| (CDR G167974)) (|b| NIL)) ((OR (ATOM G167974) (PROGN (SETQ |b| (CAR G167974)) NIL)) @@ -2587,9 +2587,9 @@ NIL (SEQ (EXIT (PROGN (SPADLET |d| (APP |s| |x| |y| |d|)) (SPADLET |d| - (APP |b| (PLUS |x| 1) |y| |d|)) + (APP |b| (+ |x| 1) |y| |d|)) (SPADLET |x| - (PLUS (PLUS |x| 1) (WIDTH |b|))))))))) + (+ (+ |x| 1) (WIDTH |b|))))))))) |d|))))) ;--% Function to compute Width @@ -2702,7 +2702,7 @@ NIL (COND ((> 1 |u|) (SPADLET |negative| 1)) ('T (SPADLET |negative| 0))) - (PLUS (DIGITS-BY-RADIX |u| 10) |negative|)))) + (+ (DIGITS-BY-RADIX |u| 10) |negative|)))) ((ATOM |u|) (|#| (|atom2String| |u|))) ((PROGN (SPADLET |ISTMP#1| (|putWidth| |u|)) @@ -2786,9 +2786,9 @@ NIL ((AND (EQL 0 |interSpace|) (|infixArgNeedsParens| |firstArg| |leftPrec| '|right|)) - (PLUS 2 (WIDTH |firstArg|))) + (+ 2 (WIDTH |firstArg|))) ('T (WIDTH |firstArg|)))) - (PLUS |widthFirstArg| + (+ |widthFirstArg| (PROG (G168041) (SPADLET G168041 0) (RETURN @@ -2803,14 +2803,14 @@ NIL (SEQ (EXIT (SETQ G168041 - (PLUS G168041 - (PLUS |interSpace| + (+ G168041 + (+ |interSpace| (COND ((AND (EQL 0 |interSpace|) (|infixArgNeedsParens| |x| |rightPrec| '|left|)) - (PLUS 2 (WIDTH |x|))) + (+ 2 (WIDTH |x|))) ('T (WIDTH |x|))))))))))))) ('T 0))) (SPADLET |newFirst| @@ -2825,11 +2825,11 @@ NIL (|l| (SPADLET |ll| (CDR |l|))) ('T (SPADLET |ll| NIL))) (CONS |oldFirst| - (PLUS (|opWidth| |oldFirst| |ll|) + (+ (|opWidth| |oldFirst| |ll|) |argsWidth|))))) ('T (CONS (|putWidth| |oldFirst|) - (PLUS (PLUS 2 (WIDTH |oldFirst|)) + (+ (+ 2 (WIDTH |oldFirst|)) |argsWidth|))))) (RPLACA |u| |newFirst|) |u|)))))) @@ -2847,13 +2847,13 @@ NIL (RETURN (COND ((BOOT-EQUAL |op| 'EQUATNUM) 4) - ((NUMBERP |op|) (PLUS 2 (SIZE (STRINGIMAGE |op|)))) + ((NUMBERP |op|) (+ 2 (SIZE (STRINGIMAGE |op|)))) ((NULL |has2Arguments|) (COND ((SPADLET |a| (GETL |op| 'PREFIXOP)) (SIZE |a|)) - ('T (PLUS 2 (SIZE (PNAME |op|)))))) + ('T (+ 2 (SIZE (PNAME |op|)))))) ((SPADLET |a| (GETL |op| 'INFIXOP)) (SIZE |a|)) - ('T (PLUS 2 (SIZE (PNAME |op|)))))))) + ('T (+ 2 (SIZE (PNAME |op|)))))))) ;matrixBorder(x,y1,y2,d,leftOrRight) == ; y1 = y2 => @@ -3219,7 +3219,7 @@ NIL (|LargeMatrixp| (CADR |u|) (SPADDIFFERENCE |width| 3) |dist|)) (|largeMatrixAlist| |ans|)) - ('T (SPADLET |n| (PLUS 3 (WIDTH (CADR |u|)))) + ('T (SPADLET |n| (+ 3 (WIDTH (CADR |u|)))) (SPADLET |dist| (SPADDIFFERENCE |dist| |n|)) (SPADLET |ans| (DO ((G168281 (CDDR |u|) (CDR G168281)) @@ -3318,7 +3318,7 @@ NIL (INTERNL "matrix" (STRINGIMAGE (SPADLET |$MatrixCount| - (PLUS |$MatrixCount| 1))))) + (+ |$MatrixCount| 1))))) (SPADLET |$MatrixList| (CONS (CONS |name| |m|) |$MatrixList|)) (EXIT |name|))))) @@ -3330,7 +3330,7 @@ NIL (RETURN (PROGN (SPADLET |a| (CADR G168341)) - (APP |a| (PLUS |x| 1) |y| (|appChar| (PNAME '|'|) |x| |y| |d|)))))) + (APP |a| (+ |x| 1) |y| (|appChar| (PNAME '|'|) |x| |y| |d|)))))) ;quoteSub [.,a] == subspan a @@ -3348,7 +3348,7 @@ NIL (DEFUN |quoteWidth| (G168374) (PROG (|a|) - (RETURN (PROGN (SPADLET |a| (CADR G168374)) (PLUS 1 (WIDTH |a|)))))) + (RETURN (PROGN (SPADLET |a| (CADR G168374)) (+ 1 (WIDTH |a|)))))) ;SubstWhileDesizing(u,m) == ; -- arg. m is always nil (historical: EU directive to increase argument lists 1991/XGII) @@ -3446,7 +3446,7 @@ NIL ; MAX(1 + height CADR u, subspan CADDR u) (DEFUN |sigmaSub| (|u|) - (MAX (PLUS 1 (|height| (CADR |u|))) (|subspan| (CADDR |u|)))) + (MAX (+ 1 (|height| (CADR |u|))) (|subspan| (CADDR |u|)))) ;sigmaSup u == ; --The height function for sigmas with lower limit only @@ -3500,7 +3500,7 @@ NIL (PROGN (SPADLET |kindWidth| (COND ((BOOT-EQUAL |kind| '|pi|) 5) ('T 3))) - (PLUS (PLUS (MAX |kindWidth| (WIDTH |bot|) + (+ (+ (MAX |kindWidth| (WIDTH |bot|) (COND (|top| (WIDTH |top|)) ('T 0))) 2) (WIDTH |arg|)))))) @@ -3554,9 +3554,9 @@ NIL (SPADLET |opWidth| (COND ((BOOT-EQUAL |kind| '|pi|) 5) ('T 3))) (SPADLET |maxWidth| (MAX |opWidth| |botWidth| |topWidth|)) (SPADLET |xCenter| - (PLUS (QUOTIENT (SPADDIFFERENCE |maxWidth| 1) 2) |x|)) + (+ (QUOTIENT (SPADDIFFERENCE |maxWidth| 1) 2) |x|)) (SPADLET |d| - (APP |arg| (PLUS (PLUS |x| 2) |maxWidth|) |y| |d|)) + (APP |arg| (+ (+ |x| 2) |maxWidth|) |y| |d|)) (SPADLET |d| (COND ((AND (ATOM |bot|) @@ -3564,7 +3564,7 @@ NIL (APP |bot| |xCenter| (SPADDIFFERENCE |y| 2) |d|)) ('T (APP |bot| - (PLUS |x| + (+ |x| (QUOTIENT (SPADDIFFERENCE |maxWidth| |botWidth|) @@ -3577,15 +3577,15 @@ NIL (COND ((AND (ATOM |top|) (EQL (SIZE (|atom2String| |top|)) 1)) - (APP |top| |xCenter| (PLUS |y| 2) |d|)) + (APP |top| |xCenter| (+ |y| 2) |d|)) ('T (APP |top| - (PLUS |x| + (+ |x| (QUOTIENT (SPADDIFFERENCE |maxWidth| |topWidth|) 2)) - (PLUS (PLUS |y| 2) (|subspan| |top|)) + (+ (+ |y| 2) (|subspan| |top|)) |d|)))))) (SPADLET |delta| (COND ((BOOT-EQUAL |kind| '|pi|) 2) ('T 1))) (SPADLET |opCode| @@ -3661,21 +3661,21 @@ NIL ; MAX(1 + height CADR u, subspan CADDDR u) (DEFUN |sigma2Sub| (|u|) - (MAX (PLUS 1 (|height| (CADR |u|))) (|subspan| (CADDDR |u|)))) + (MAX (+ 1 (|height| (CADR |u|))) (|subspan| (CADDDR |u|)))) ;sigma2Sup u == ; --The depth function for sigmas with 2 limits ; MAX(1 + height CADDR u, superspan CADDDR u) (DEFUN |sigma2Sup| (|u|) - (MAX (PLUS 1 (|height| (CADDR |u|))) (|superspan| (CADDDR |u|)))) + (MAX (+ 1 (|height| (CADDR |u|))) (|superspan| (CADDDR |u|)))) ;piSub u == ; --The depth function for pi's (products) ; MAX(1 + height CADR u, subspan CADDR u) (DEFUN |piSub| (|u|) - (MAX (PLUS 1 (|height| (CADR |u|))) (|subspan| (CADDR |u|)))) + (MAX (+ 1 (|height| (CADR |u|))) (|subspan| (CADDR |u|)))) ;piSup u == ; --The height function for pi's (products) @@ -3732,14 +3732,14 @@ NIL ; MAX(1 + height CADR u, subspan CADDDR u) (DEFUN |pi2Sub| (|u|) - (MAX (PLUS 1 (|height| (CADR |u|))) (|subspan| (CADDDR |u|)))) + (MAX (+ 1 (|height| (CADR |u|))) (|subspan| (CADDDR |u|)))) ;pi2Sup u == ; --The depth function for pi's with 2 limits ; MAX(1 + height CADDR u, superspan CADDDR u) (DEFUN |pi2Sup| (|u|) - (MAX (PLUS 1 (|height| (CADDR |u|))) (|superspan| (CADDDR |u|)))) + (MAX (+ 1 (|height| (CADDR |u|))) (|superspan| (CADDDR |u|)))) ;pi2App(u,x,y,d) == ; [.,bot,top,arg]:=u @@ -3762,7 +3762,7 @@ NIL (PROGN (SPADLET |a| (CADR G168609)) (SPADLET |b| (CADDR G168609)) - (PLUS (PLUS 1 (|height| |a|)) (|superspan| |b|)))))) + (+ (+ 1 (|height| |a|)) (|superspan| |b|)))))) ;overlabelWidth [.,a,b] == WIDTH b @@ -3789,16 +3789,16 @@ NIL (SPADLET |a| (CADR G168638)) (SPADLET |b| (CADDR G168638)) (SPADLET |underApp| (APP |b| |x| |y| |d|)) - (SPADLET |endPoint| (SPADDIFFERENCE (PLUS |x| (WIDTH |b|)) 1)) - (SPADLET |middle| (QUOTIENT (PLUS |x| |endPoint|) 2)) - (SPADLET |h| (PLUS (PLUS |y| (|superspan| |b|)) 1)) - (SPADLET |d| (APP |a| |middle| (PLUS |h| 1) |d|)) - (|apphor| |x| (SPADDIFFERENCE (PLUS |x| (WIDTH |b|)) 1) - (PLUS (PLUS |y| (|superspan| |b|)) 1) |d| '|\||))))) + (SPADLET |endPoint| (SPADDIFFERENCE (+ |x| (WIDTH |b|)) 1)) + (SPADLET |middle| (QUOTIENT (+ |x| |endPoint|) 2)) + (SPADLET |h| (+ (+ |y| (|superspan| |b|)) 1)) + (SPADLET |d| (APP |a| |middle| (+ |h| 1) |d|)) + (|apphor| |x| (SPADDIFFERENCE (+ |x| (WIDTH |b|)) 1) + (+ (+ |y| (|superspan| |b|)) 1) |d| '|\||))))) ;overbarSuper u == 1 + superspan u.1 -(DEFUN |overbarSuper| (|u|) (PLUS 1 (|superspan| (ELT |u| 1)))) +(DEFUN |overbarSuper| (|u|) (+ 1 (|superspan| (ELT |u| 1)))) ;overbarWidth u == WIDTH u.1 @@ -3813,8 +3813,8 @@ NIL (RETURN (PROGN (SPADLET |underApp| (APP (ELT |u| 1) |x| |y| |d|)) - (|apphor| |x| (SPADDIFFERENCE (PLUS |x| (WIDTH (ELT |u| 1))) 1) - (PLUS (PLUS |y| (|superspan| (ELT |u| 1))) 1) |d| UNDERBAR))))) + (|apphor| |x| (SPADDIFFERENCE (+ |x| (WIDTH (ELT |u| 1))) 1) + (+ (+ |y| (|superspan| (ELT |u| 1))) 1) |d| UNDERBAR))))) ;indefIntegralSub u == ; -- form is INDEFINTEGRAL(expr,dx) @@ -3847,9 +3847,9 @@ NIL (PROGN (SPADLET |expr| (CADR |u|)) (SPADLET |dx| (CADDR |u|)) - (SPADLET |d| (APP |expr| (PLUS |x| 4) |y| |d|)) + (SPADLET |d| (APP |expr| (+ |x| 4) |y| |d|)) (SPADLET |d| - (APP |dx| (PLUS (PLUS |x| 5) (WIDTH |expr|)) |y| |d|)) + (APP |dx| (+ (+ |x| 5) (WIDTH |expr|)) |y| |d|)) (|xLate| (CONS (CONS '(0 . -1) (|specialChar| '|llc|)) (CONS (CONS '(1 . -1) (|specialChar| '|lrc|)) (CONS (CONS '(1 . 0) @@ -3871,19 +3871,19 @@ NIL (DEFUN |indefIntegralWidth| (|u|) (COND ((NEQUAL (|#| |u|) 3) (THROW '|outputFailure| '|outputFailure|)) - ('T (PLUS (PLUS 5 (WIDTH (ELT |u| 1))) (WIDTH (ELT |u| 2)))))) + ('T (+ (+ 5 (WIDTH (ELT |u| 1))) (WIDTH (ELT |u| 2)))))) ;intSub u == ; MAX(1 + height u.1, subspan u.3) (DEFUN |intSub| (|u|) - (MAX (PLUS 1 (|height| (ELT |u| 1))) (|subspan| (ELT |u| 3)))) + (MAX (+ 1 (|height| (ELT |u| 1))) (|subspan| (ELT |u| 3)))) ;intSup u == ; MAX(1 + height u.2, superspan u.3) (DEFUN |intSup| (|u|) - (MAX (PLUS 1 (|height| (ELT |u| 2))) (|superspan| (ELT |u| 3)))) + (MAX (+ 1 (|height| (ELT |u| 2))) (|superspan| (ELT |u| 3)))) ;intApp(u,x,y,d) == ; [.,bot,top,arg]:=u @@ -3905,8 +3905,8 @@ NIL (SPADLET |arg| (CADDDR |u|)) (SPADLET |d| (APP |arg| - (PLUS (PLUS |x| 4) - (MAX (PLUS (SPADDIFFERENCE 4) + (+ (+ |x| 4) + (MAX (+ (SPADDIFFERENCE 4) (WIDTH |bot|)) (WIDTH |top|))) |y| |d|)) @@ -3916,8 +3916,8 @@ NIL (|superspan| |bot|)) |d|)) (SPADLET |d| - (APP |top| (PLUS |x| 3) - (PLUS (PLUS |y| 2) (|subspan| |top|)) |d|)) + (APP |top| (+ |x| 3) + (+ (+ |y| 2) (|subspan| |top|)) |d|)) (|xLate| (CONS (CONS '(0 . -1) (|specialChar| '|llc|)) (CONS (CONS '(1 . -1) (|specialChar| '|lrc|)) (CONS (CONS '(1 . 0) @@ -3939,7 +3939,7 @@ NIL (COND ((QSLESSP (|#| |u|) 4) (THROW '|outputFailure| '|outputFailure|)) ('T - (PLUS (PLUS (MAX (PLUS (SPADDIFFERENCE 4) (WIDTH (ELT |u| 1))) + (+ (+ (MAX (+ (SPADDIFFERENCE 4) (WIDTH (ELT |u| 1))) (WIDTH (ELT |u| 2))) (WIDTH (ELT |u| 3))) 5)))) @@ -3965,8 +3965,8 @@ NIL NIL)) NIL) (SEQ (EXIT (SPADLET |d| - (|appChar| |c| (PLUS |x| |a|) - (PLUS |y| |b|) |d|))))) + (|appChar| |c| (+ |x| |a|) + (+ |y| |b|) |d|))))) |d|))))) ;concatTrouble(u,d,start,lineLength,$addBlankIfTrue) == @@ -4022,7 +4022,7 @@ NIL ((> |lineLength| 2) (|charybdis| (|concatTrouble,fixUp| |y|) - (PLUS |start| 2) + (+ |start| 2) (SPADDIFFERENCE |lineLength| 2))) ('T (|charybdis| @@ -4076,8 +4076,8 @@ NIL ((OR (ATOM |x|) (NULL (> |maxW| (SPADLET |width| - (PLUS - (PLUS |oneOrZero| + (+ + (+ |oneOrZero| (WIDTH (CAR |x|))) |totalWidth|))))) NIL) @@ -4678,7 +4678,7 @@ NIL (RETURN (DO ((G169062 NIL (NULL G169051)) (G169063 |l| (CDR G169063)) (|x| NIL) - (|i| (PLUS |n| 1) (+ |i| 1))) + (|i| (+ |n| 1) (+ |i| 1))) ((OR G169062 (ATOM G169063) (PROGN (SETQ |x| (CAR G169063)) NIL)) G169051) @@ -4812,7 +4812,7 @@ NIL (PROGN (SPADLET |m| (QCDR |ISTMP#3|)) 'T) (PROGN (SPADLET |m| (NREVERSE |m|)) 'T)))) (|charyTop| (CONS 'CONCATB |m|) |start| |linelength|) - (|charyTop| (CONS 'SC |l|) (PLUS |start| 2) + (|charyTop| (CONS 'SC |l|) (+ |start| 2) (SPADDIFFERENCE |linelength| 2))) ((AND (CONSP |u|) (EQ (QCAR |u|) 'CENTER) (PROGN @@ -5021,7 +5021,7 @@ NIL (|charyTop| (CONS 'CONCATB (CONS |loop| (CONS '|repeat| NIL))) |start| |linelength|) - (|charyTop| |body| (PLUS |start| 2) + (|charyTop| |body| (+ |start| 2) (SPADDIFFERENCE |linelength| 2))) ((AND (PROGN (SPADLET |ISTMP#1| (CDR |v|)) @@ -5061,7 +5061,7 @@ NIL (CONS 'CONCATB (CONS |wu| (CONS |loop| (CONS '|repeat| NIL)))) |start| |linelength|) - (|charyTop| |body| (PLUS |start| 2) + (|charyTop| |body| (+ |start| 2) (SPADDIFFERENCE |linelength| 2))) ('T (|concatTrouble| (CDR |v|) |d| |start| |linelength| 'T)))) ((GETL |x| 'INFIXOP) @@ -5117,7 +5117,7 @@ NIL (declare (ignore |u|)) (PROGN (|charybdis| "-" |start| |linelength|) - (|charybdis| (ELT |v| 1) (PLUS |start| 3) + (|charybdis| (ELT |v| 1) (+ |start| 3) (SPADDIFFERENCE |linelength| 3)) " ")) @@ -5137,14 +5137,14 @@ NIL ((|member| |d| '(" := " "= ")) (|charybdis| (CONS 'CONCATB (CONS (ELT |v| 1) (CONS |d| NIL))) |start| |linelength|) - (|charybdis| (ELT |v| 2) (PLUS |start| 2) + (|charybdis| (ELT |v| 2) (+ |start| 2) (SPADDIFFERENCE |linelength| 2)) " ") ('T - (|charybdis| (ELT |v| 1) (PLUS |start| 2) + (|charybdis| (ELT |v| 1) (+ |start| 2) (SPADDIFFERENCE |linelength| 2)) (COND (|d| (|prnd| |start| |d|))) - (|charybdis| (ELT |v| 2) (PLUS |start| 2) + (|charybdis| (ELT |v| 2) (+ |start| 2) (SPADDIFFERENCE |linelength| 2)) " "))) @@ -5191,7 +5191,7 @@ NIL (SPADLET |m| (CDR |v|)) (COND ((> (WIDTH (ELT |v| 1)) (SPADDIFFERENCE |linelength| 2)) - (|charybdis| (ELT |v| 1) (PLUS |start| 2) + (|charybdis| (ELT |v| 1) (+ |start| 2) (SPADDIFFERENCE |linelength| 2)) (COND ((NULL (CDDR |v|)) " ") @@ -5213,7 +5213,7 @@ NIL (RPLACD |dm| |ddm|) (SPADLET |m| (CDR |m|)))))))) (RPLAC (CAR |v|) (CAR (ELT |v| 0))) (RPLACD |m| NIL) - (|charybdis| |v| (PLUS |start| 2) + (|charybdis| |v| (+ |start| 2) (SPADDIFFERENCE |linelength| 2)) (|split2| |u| |dm| |ddm| |start| |linelength|)))))))) @@ -5238,7 +5238,7 @@ NIL (> (SPADDIFFERENCE |linelength| 2) (WIDTH (CONS (|keyp| |u|) |dm|)))) (|charybdis| (CONS (|keyp| |u|) |dm|) - (COND (|m| (PLUS |start| 2)) ('T |start|)) + (COND (|m| (+ |start| 2)) ('T |start|)) (COND (|m| (SPADDIFFERENCE |linelength| 2)) ('T |linelength|))) @@ -5253,7 +5253,7 @@ NIL (DEFUN |charyElse| (|u| |v| |start| |linelength|) (PROGN - (|charybdis| (ELT |v| 1) (PLUS |start| 3) + (|charybdis| (ELT |v| 1) (+ |start| 3) (SPADDIFFERENCE |linelength| 3)) (COND ((NULL (CDDR |u|)) " ") @@ -5329,7 +5329,7 @@ NIL (COND ((NULL |u|) 0) ((NULL (CDR |u|)) (WIDTH (CAR |u|))) - ('T (PLUS (PLUS 1 (WIDTH (CAR |u|))) (|aggwidth| (CDR |u|)))))) + ('T (+ (+ 1 (WIDTH (CAR |u|))) (|aggwidth| (CDR |u|)))))) ;argsapp(u,x,y,d) == appargs(rest u,x,y,d) @@ -5404,10 +5404,10 @@ NIL (COND ((NULL |u|) |d|) ((NULL (CDR |u|)) (APP (CAR |u|) |x| |y| |d|)) - ('T (SPADLET |temp| (PLUS |x| (WIDTH (CAR |u|)))) + ('T (SPADLET |temp| (+ |x| (WIDTH (CAR |u|)))) (SPADLET |temparg1| (APP (CAR |u|) |x| |y| |d|)) (SPADLET |temparg2| (APP |s| |temp| |y| |temparg1|)) - (|appagg1| (CDR |u|) (PLUS 1 |temp|) |y| |temparg2| |s|)))))) + (|appagg1| (CDR |u|) (+ 1 |temp|) |y| |temparg2| |s|)))))) ;--Note the similarity between the definition below of appargs and above ;--of appagg. (why?) @@ -5433,10 +5433,10 @@ NIL (COND ((NULL |u|) |d|) ((NULL (CDR |u|)) (APP (CAR |u|) |x| |y| |d|)) - ('T (SPADLET |temp| (PLUS |x| (WIDTH (CAR |u|)))) + ('T (SPADLET |temp| (+ |x| (WIDTH (CAR |u|)))) (SPADLET |temparg1| (APP (CAR |u|) |x| |y| |d|)) (SPADLET |temparg2| (APP |s| |temp| |y| |temparg1|)) - (|appargs| (CDR |u|) (PLUS 1 |temp|) |y| |temparg2|)))))) + (|appargs| (CDR |u|) (+ 1 |temp|) |y| |temparg2|)))))) ;apprpar(x, y, y1, y2, d) == ; (^(_*TALLPAR) or (y2 - y1 < 2)) => APP('")", x, y, d) @@ -5501,15 +5501,15 @@ NIL (PROGN (SPADLET |w| (WIDTH (CAAR |u|))) (SPADLET |b| (SPADDIFFERENCE |y| (|subspan| (CDR |u|)))) - (SPADLET |p| (PLUS |y| (|superspan| (CDR |u|)))) + (SPADLET |p| (+ |y| (|superspan| (CDR |u|)))) (SPADLET |temparg1| (APP (|keyp| |u|) |x| |y| |d|)) (SPADLET |temparg2| - (|applpar| (PLUS |x| |w|) |y| |b| |p| |temparg1|)) + (|applpar| (+ |x| |w|) |y| |b| |p| |temparg1|)) (SPADLET |temparg3| - (|appagg| (CDR |u|) (PLUS (PLUS |x| 1) |w|) |y| + (|appagg| (CDR |u|) (+ (+ |x| 1) |w|) |y| |temparg2|)) (|apprpar| - (PLUS (PLUS (PLUS |x| 1) |w|) (|aggwidth| (CDR |u|))) |y| + (+ (+ (+ |x| 1) |w|) (|aggwidth| (CDR |u|))) |y| |b| |p| |temparg3|))))) ;appext(u,x,y,d) == @@ -5536,28 +5536,28 @@ NIL (SPADLET |xptr| |x|) (SPADLET |yptr| (SPADDIFFERENCE |y| - (PLUS (PLUS (|subspan| (CADR |u|)) + (+ (+ (|subspan| (CADR |u|)) (|superspan| (|agg| 3 |u|))) 1))) (SPADLET |d| (APP (CADR |u|) |x| |y| |d|)) (SPADLET |d| (APP (|agg| 2 |u|) |xptr| |yptr| |d|)) - (SPADLET |xptr| (PLUS |xptr| (WIDTH (|agg| 2 |u|)))) + (SPADLET |xptr| (+ |xptr| (WIDTH (|agg| 2 |u|)))) (SPADLET |d| (APP "=" |xptr| |yptr| |d|)) - (SPADLET |d| (APP (|agg| 3 |u|) (PLUS 1 |xptr|) |yptr| |d|)) + (SPADLET |d| (APP (|agg| 3 |u|) (+ 1 |xptr|) |yptr| |d|)) (SPADLET |yptr| - (PLUS (PLUS (PLUS |y| 1) (|superspan| (CADR |u|))) + (+ (+ (+ |y| 1) (|superspan| (CADR |u|))) (SUBSPAD (|agg| 4 |u|)))) (SPADLET |d| (APP (|agg| 4 |u|) |x| |yptr| |d|)) (SPADLET |temp| - (PLUS (PLUS 1 (WIDTH (|agg| 2 |u|))) + (+ (+ 1 (WIDTH (|agg| 2 |u|))) (WIDTH (|agg| 3 |u|)))) (SPADLET |n| (MAX (WIDTH (CADR |u|)) (WIDTH (|agg| 4 |u|)) |temp|)) (COND ((AND (EQCAR (CAR (SPADLET |z| (|agg| 5 |u|))) 'EXT) (OR (EQ |n| 3) (AND (> |n| 3) (NULL (ATOM |z|))))) - (SPADLET |n| (PLUS 1 |n|)))) - (SPADLET |d| (APP |z| (PLUS |x| |n|) |y| |d|)))))) + (SPADLET |n| (+ 1 |n|)))) + (SPADLET |d| (APP |z| (+ |x| |n|) |y| |d|)))))) ;apphor(x1,x2,y,d,char) == ; temp := (x1 = x2 => d; apphor(x1, x2 - 1, y, d,char)) @@ -5616,26 +5616,26 @@ NIL ('T "+"))) (SPADLET |dp| (|member| (|keyp| (|absym| (CAR |u|))) '(+ -))) (SPADLET |tempx| - (PLUS (PLUS |x| (WIDTH |ac|)) (COND (|dp| 5) ('T 3)))) + (+ (+ |x| (WIDTH |ac|)) (COND (|dp| 5) ('T 3)))) (SPADLET |tempdblock| (PROGN (SPADLET |temparg1| - (APP |sc| (PLUS |x| 1) |y| |d|)) + (APP |sc| (+ |x| 1) |y| |d|)) (COND (|dp| (SPADLET |bot| (SPADDIFFERENCE |y| (|subspan| |ac|))) (SPADLET |top| - (PLUS |y| (|superspan| |ac|))) + (+ |y| (|superspan| |ac|))) (SPADLET |temparg2| - (|applpar| (PLUS |x| 3) |y| |bot| + (|applpar| (+ |x| 3) |y| |bot| |top| |temparg1|)) (SPADLET |temparg3| - (APP |ac| (PLUS |x| 4) |y| + (APP |ac| (+ |x| 4) |y| |temparg2|)) - (|apprpar| (PLUS (PLUS |x| 4) (WIDTH |ac|)) + (|apprpar| (+ (+ |x| 4) (WIDTH |ac|)) |y| |bot| |top| |temparg3|)) - ('T (APP |ac| (PLUS |x| 3) |y| |temparg1|))))) + ('T (APP |ac| (+ |x| 3) |y| |temparg1|))))) (|appsum| (CDR |u|) |tempx| |y| |tempdblock|)))))) ;appneg(u, x, y, d) == @@ -5656,10 +5656,10 @@ NIL (RETURN (PROGN (SPADLET |bot| (SPADDIFFERENCE |y| (|subspan| |u|))) - (SPADLET |top| (PLUS |y| (|superspan| |u|))) + (SPADLET |top| (+ |y| (|superspan| |u|))) (SPADLET |temparg1| (|applpar| |x| |y| |bot| |top| |d|)) - (SPADLET |temparg2| (APP |u| (PLUS |x| 1) |y| |temparg1|)) - (|apprpar| (PLUS (PLUS |x| 1) (WIDTH |u|)) |y| |bot| |top| + (SPADLET |temparg2| (APP |u| (+ |x| 1) |y| |temparg1|)) + (|apprpar| (+ (+ |x| 1) (WIDTH |u|)) |y| |bot| |top| |temparg2|))))) ;appparu1(u, x, y, d) == @@ -5687,8 +5687,8 @@ NIL (SPADLET |w| (WIDTH (CAR |u|))) (SPADLET |temparg1| (APP (CADR |u|) |x| |y| |d|)) (SPADLET |temparg2| - (APP ":" (PLUS |x| |w|) |y| |temparg1|)) - (APP (CADR (CDR |u|)) (PLUS (PLUS |x| 2) |w|) |y| |temparg2|))))) + (APP ":" (+ |x| |w|) |y| |temparg1|)) + (APP (CADR (CDR |u|)) (+ (+ |x| 2) |w|) |y| |temparg2|))))) ;appsub(u, x, y, d) == ; temparg1 := x + WIDTH CADR u @@ -5700,7 +5700,7 @@ NIL (PROG (|temparg1| |temparg2| |temparg3|) (RETURN (PROGN - (SPADLET |temparg1| (PLUS |x| (WIDTH (CADR |u|)))) + (SPADLET |temparg1| (+ |x| (WIDTH (CADR |u|)))) (SPADLET |temparg2| (SPADDIFFERENCE (SPADDIFFERENCE |y| 1) (|superspan| (CDDR |u|)))) @@ -5750,7 +5750,7 @@ NIL ; superspan(u) + 1 + subspan(u) (DEFUN |height| (|u|) - (PLUS (PLUS (|superspan| |u|) 1) (|subspan| |u|))) + (+ (+ (|superspan| |u|) 1) (|subspan| |u|))) ;extsub(u) == ; MAX(subspan agg(5, u), height(agg(3, u)), subspan CADR u ) @@ -5763,7 +5763,7 @@ NIL ; MAX(superspan CADR u + height agg(4, u), superspan agg(5, u) ) (DEFUN |extsuper| (|u|) - (MAX (PLUS (|superspan| (CADR |u|)) (|height| (|agg| 4 |u|))) + (MAX (+ (|superspan| (CADR |u|)) (|height| (|agg| 4 |u|))) (|superspan| (|agg| 5 |u|)))) ;extwidth(u) == @@ -5782,7 +5782,7 @@ NIL (SEQ (PROGN (SPADLET |n| (MAX (WIDTH (CADR |u|)) (WIDTH (|agg| 4 |u|)) - (PLUS (PLUS 1 (WIDTH (|agg| 2 |u|))) + (+ (+ 1 (WIDTH (|agg| 2 |u|))) (WIDTH (|agg| 3 |u|))))) (SEQ (OR NIL (COND @@ -5790,8 +5790,8 @@ NIL 'EXT) (OR (EQ |n| 3) (AND (> |n| 3) (NULL (ATOM |z|))))) - (EXIT (SPADLET |n| (PLUS 1 |n|)))))) - (PLUS |n| (WIDTH (|agg| 5 |u|))))))))) + (EXIT (SPADLET |n| (+ 1 |n|)))))) + (+ |n| (WIDTH (|agg| 5 |u|))))))))) ;appfrac(u, x, y, d) == ; -- Added "1+" to both QUOTIENT statements so that when exact centering is @@ -5813,9 +5813,9 @@ NIL (PROGN (SPADLET |w| (WIDTH |u|)) (SPADLET |tempx| - (PLUS |x| + (+ |x| (QUOTIENT - (SPADDIFFERENCE (PLUS 1 |w|) + (SPADDIFFERENCE (+ 1 |w|) (WIDTH (CADR (CDR |u|)))) 2))) (SPADLET |tempy| @@ -5825,14 +5825,14 @@ NIL 1)) (SPADLET |temparg3| (APP (CADR (CDR |u|)) |tempx| |tempy| |d|)) (SPADLET |temparg4| - (|apphor| |x| (SPADDIFFERENCE (PLUS |x| |w|) 1) |y| + (|apphor| |x| (SPADDIFFERENCE (+ |x| |w|) 1) |y| |temparg3| (|specialChar| '|hbar|))) (APP (CADR |u|) - (PLUS |x| + (+ |x| (QUOTIENT - (SPADDIFFERENCE (PLUS 1 |w|) (WIDTH (CADR |u|))) + (SPADDIFFERENCE (+ 1 |w|) (WIDTH (CADR |u|))) 2)) - (PLUS (PLUS |y| 1) (|subspan| (CADR |u|))) |temparg4|))))) + (+ (+ |y| 1) (|subspan| (CADR |u|))) |temparg4|))))) ;fracsub(u) == height CADR rest u @@ -5864,7 +5864,7 @@ NIL (AND (CONSP |ISTMP#1|) (PROGN (SPADLET |op| (QCAR |ISTMP#1|)) 'T))) (BOOT-EQUAL |op| 'OVER)) - (SPADLET |numw| (PLUS |numw| 2)))) + (SPADLET |numw| (+ |numw| 2)))) (COND ((AND (CONSP |den|) (PROGN @@ -5872,7 +5872,7 @@ NIL (AND (CONSP |ISTMP#1|) (PROGN (SPADLET |op| (QCAR |ISTMP#1|)) 'T))) (BOOT-EQUAL |op| 'OVER)) - (SPADLET |denw| (PLUS |denw| 2)))) + (SPADLET |denw| (+ |denw| 2)))) (MAX |numw| |denw|))))) ;slashSub u == @@ -5903,9 +5903,9 @@ NIL (PROGN (SPADLET |temparg1| (APP (CADR |u|) |x| |y| |d|)) (SPADLET |temparg2| - (APP "/" (PLUS |x| (WIDTH (CADR |u|))) + (APP "/" (+ |x| (WIDTH (CADR |u|))) |y| |temparg1|)) - (APP (CADR (CDR |u|)) (PLUS (PLUS |x| 1) (WIDTH (CADR |u|))) + (APP (CADR (CDR |u|)) (+ (+ |x| 1) (WIDTH (CADR |u|))) |y| |temparg2|))))) ;slashWidth(u) == @@ -5916,7 +5916,7 @@ NIL ; 1 + WIDTH CADR u + WIDTH CADR rest u (DEFUN |slashWidth| (|u|) - (PLUS (PLUS 1 (WIDTH (CADR |u|))) (WIDTH (CADR (CDR |u|))))) + (+ (+ 1 (WIDTH (CADR |u|))) (WIDTH (CADR (CDR |u|))))) ;longext(u, i, n) == ; x := REVERSE u @@ -6003,31 +6003,31 @@ NIL (SPADLET |subR| (|subspan| (ELT |u| 2))) (SPADLET |d| (APP (ELT |u| 2) |x| - (PLUS (PLUS (SPADDIFFERENCE |y| |subB|) 1) + (+ (+ (SPADDIFFERENCE |y| |subB|) 1) |subR|) |d|))) ('T (SPADLET |widR| 1))) (SPADLET |d| - (APP (ELT |u| 1) (PLUS (PLUS |x| |widR|) 1) |y| |d|)) + (APP (ELT |u| 1) (+ (+ |x| |widR|) 1) |y| |d|)) (SPADLET |d| - (|apphor| (PLUS (PLUS |x| |widR|) 1) - (PLUS (PLUS |x| |widR|) |widB|) - (PLUS (PLUS |y| |supB|) 1) |d| + (|apphor| (+ (+ |x| |widR|) 1) + (+ (+ |x| |widR|) |widB|) + (+ (+ |y| |supB|) 1) |d| (|specialChar| '|hbar|))) (SPADLET |d| (|appvertline| (|specialChar| '|vbar|) - (PLUS |x| |widR|) (SPADDIFFERENCE |y| |subB|) - (PLUS |y| |supB|) |d|)) + (+ |x| |widR|) (SPADDIFFERENCE |y| |subB|) + (+ |y| |supB|) |d|)) (SPADLET |d| - (APP (|specialChar| '|ulc|) (PLUS |x| |widR|) - (PLUS (PLUS |y| |supB|) 1) |d|)) + (APP (|specialChar| '|ulc|) (+ |x| |widR|) + (+ (+ |y| |supB|) 1) |d|)) (SPADLET |d| (APP (|specialChar| '|urc|) - (PLUS (PLUS (PLUS |x| |widR|) |widB|) 1) - (PLUS (PLUS |y| |supB|) 1) |d|)) + (+ (+ (+ |x| |widR|) |widB|) 1) + (+ (+ |y| |supB|) 1) |d|)) (SPADLET |d| (APP (|specialChar| '|bslash|) - (SPADDIFFERENCE (PLUS |x| |widR|) 1) + (SPADDIFFERENCE (+ |x| |widR|) 1) (SPADDIFFERENCE |y| |subB|) |d|)))))) ;boxApp(u, x, y, d) == @@ -6050,36 +6050,36 @@ NIL (RETURN (COND ((CDDR |u|) (|boxLApp| |u| |x| |y| |d|)) - ('T (SPADLET |a| (PLUS 1 (|superspan| (ELT |u| 1)))) - (SPADLET |b| (PLUS 1 (|subspan| (ELT |u| 1)))) - (SPADLET |w| (PLUS 2 (WIDTH (ELT |u| 1)))) + ('T (SPADLET |a| (+ 1 (|superspan| (ELT |u| 1)))) + (SPADLET |b| (+ 1 (|subspan| (ELT |u| 1)))) + (SPADLET |w| (+ 2 (WIDTH (ELT |u| 1)))) (SPADLET |d| (|appvertline| (|specialChar| '|vbar|) |x| - (PLUS (SPADDIFFERENCE |y| |b|) 1) - (SPADDIFFERENCE (PLUS |y| |a|) 1) |d|)) + (+ (SPADDIFFERENCE |y| |b|) 1) + (SPADDIFFERENCE (+ |y| |a|) 1) |d|)) (SPADLET |d| (|appvertline| (|specialChar| '|vbar|) - (PLUS (PLUS |x| |w|) 1) (SPADDIFFERENCE |y| |b|) - (PLUS |y| |a|) |d|)) + (+ (+ |x| |w|) 1) (SPADDIFFERENCE |y| |b|) + (+ |y| |a|) |d|)) (SPADLET |d| - (|apphor| (PLUS |x| 1) (PLUS |x| |w|) + (|apphor| (+ |x| 1) (+ |x| |w|) (SPADDIFFERENCE |y| |b|) |d| (|specialChar| '|hbar|))) (SPADLET |d| - (|apphor| (PLUS |x| 1) (PLUS |x| |w|) (PLUS |y| |a|) + (|apphor| (+ |x| 1) (+ |x| |w|) (+ |y| |a|) |d| (|specialChar| '|hbar|))) (SPADLET |d| - (APP (|specialChar| '|ulc|) |x| (PLUS |y| |a|) |d|)) + (APP (|specialChar| '|ulc|) |x| (+ |y| |a|) |d|)) (SPADLET |d| - (APP (|specialChar| '|urc|) (PLUS (PLUS |x| |w|) 1) - (PLUS |y| |a|) |d|)) + (APP (|specialChar| '|urc|) (+ (+ |x| |w|) 1) + (+ |y| |a|) |d|)) (SPADLET |d| (APP (|specialChar| '|llc|) |x| (SPADDIFFERENCE |y| |b|) |d|)) (SPADLET |d| - (APP (|specialChar| '|lrc|) (PLUS (PLUS |x| |w|) 1) + (APP (|specialChar| '|lrc|) (+ (+ |x| |w|) 1) (SPADDIFFERENCE |y| |b|) |d|)) - (SPADLET |d| (APP (ELT |u| 1) (PLUS 2 |x|) |y| |d|))))))) + (SPADLET |d| (APP (ELT |u| 1) (+ 2 |x|) |y| |d|))))))) ;boxLApp(u, x, y, d) == ; la := superspan u.2 @@ -6107,41 +6107,41 @@ NIL (PROGN (SPADLET |la| (|superspan| (ELT |u| 2))) (SPADLET |lb| (|subspan| (ELT |u| 2))) - (SPADLET |lw| (PLUS 2 (WIDTH (ELT |u| 2)))) - (SPADLET |lh| (PLUS (PLUS 2 |la|) |lb|)) - (SPADLET |a| (PLUS (|superspan| (ELT |u| 1)) 1)) - (SPADLET |b| (PLUS (|subspan| (ELT |u| 1)) 1)) - (SPADLET |w| (MAX |lw| (PLUS 2 (WIDTH (ELT |u| 1))))) - (SPADLET |top| (PLUS (PLUS |y| |a|) |lh|)) + (SPADLET |lw| (+ 2 (WIDTH (ELT |u| 2)))) + (SPADLET |lh| (+ (+ 2 |la|) |lb|)) + (SPADLET |a| (+ (|superspan| (ELT |u| 1)) 1)) + (SPADLET |b| (+ (|subspan| (ELT |u| 1)) 1)) + (SPADLET |w| (MAX |lw| (+ 2 (WIDTH (ELT |u| 1))))) + (SPADLET |top| (+ (+ |y| |a|) |lh|)) (SPADLET |d| (|appvertline| MATBORCH |x| (SPADDIFFERENCE |y| |b|) |top| |d|)) (SPADLET |d| - (|appHorizLine| (PLUS |x| 1) (PLUS |x| |w|) |top| |d|)) + (|appHorizLine| (+ |x| 1) (+ |x| |w|) |top| |d|)) (SPADLET |d| - (APP (ELT |u| 2) (PLUS 2 |x|) - (PLUS (PLUS (PLUS |y| |a|) |lb|) 1) |d|)) + (APP (ELT |u| 2) (+ 2 |x|) + (+ (+ (+ |y| |a|) |lb|) 1) |d|)) (SPADLET |d| - (|appHorizLine| (PLUS |x| 1) (PLUS |x| |lw|) - (PLUS |y| |a|) |d|)) + (|appHorizLine| (+ |x| 1) (+ |x| |lw|) + (+ |y| |a|) |d|)) (COND ((OR NIL (> |w| |lw|)) (SPADLET |d| - (|appvertline| MATBORCH (PLUS (PLUS |x| |lw|) 1) - (PLUS |y| |a|) (SPADDIFFERENCE |top| 1) |d|))) - ('T (SPADLET |d| (APP (ELT |u| 1) (PLUS 2 |x|) |y| |d|)) + (|appvertline| MATBORCH (+ (+ |x| |lw|) 1) + (+ |y| |a|) (SPADDIFFERENCE |top| 1) |d|))) + ('T (SPADLET |d| (APP (ELT |u| 1) (+ 2 |x|) |y| |d|)) (SPADLET |d| - (|appHorizLine| (PLUS |x| 1) (PLUS |x| |w|) + (|appHorizLine| (+ |x| 1) (+ |x| |w|) (SPADDIFFERENCE |y| |b|) |top| |d|)) (SPADLET |d| - (|appvertline| MATBORCH (PLUS (PLUS |x| |w|) 1) + (|appvertline| MATBORCH (+ (+ |x| |w|) 1) (SPADDIFFERENCE |y| |b|) |top| |d|)))))))) ;boxSub(x) == ; subspan x.1+1 (DEFUN |boxSub| (|x|) - (PLUS (|subspan| (ELT |x| 1)) 1)) + (+ (|subspan| (ELT |x| 1)) 1)) ;boxSuper(x) == ; null CDR x => 0 @@ -6160,9 +6160,9 @@ NIL (COND ((NULL (CDDR |x|)) 0) ('T - (PLUS (PLUS 2 (|subspan| (ELT |x| 2))) + (+ (+ 2 (|subspan| (ELT |x| 2))) (|superspan| (ELT |x| 2)))))) - (PLUS (PLUS |hl| 1) (|superspan| (ELT |x| 1)))))))) + (+ (+ |hl| 1) (|superspan| (ELT |x| 1)))))))) ;boxWidth(x) == ; null CDR x => 0 @@ -6181,7 +6181,7 @@ NIL (COND ((NULL (CDDR |x|)) 0) ('T (WIDTH (ELT |x| 2))))) - (PLUS 4 (MAX |wl| (WIDTH (ELT |x| 1))))))))) + (+ 4 (MAX |wl| (WIDTH (ELT |x| 1))))))))) ;nothingWidth x == ; 0 @@ -6233,7 +6233,7 @@ NIL (PROGN (SPADLET |w| (WIDTH |u|)) (SPADLET |denx| - (PLUS |x| + (+ |x| (QUOTIENT (SPADDIFFERENCE |w| (WIDTH (CADR (CDR |u|)))) @@ -6245,28 +6245,28 @@ NIL 1)) (SPADLET |d| (APP (CADR (CDR |u|)) |denx| |deny| |d|)) (SPADLET |numx| - (PLUS |x| + (+ |x| (QUOTIENT (SPADDIFFERENCE |w| (WIDTH (CADR |u|))) 2))) - (SPADLET |numy| (PLUS (PLUS |y| 1) (|subspan| (CADR |u|)))) + (SPADLET |numy| (+ (+ |y| 1) (|subspan| (CADR |u|)))) (SPADLET |d| (APP (CADR |u|) |numx| |numy| |d|)) - (SPADLET |a| (PLUS 1 (|zagSuper| |u|))) - (SPADLET |b| (PLUS 1 (|zagSub| |u|))) + (SPADLET |a| (+ 1 (|zagSuper| |u|))) + (SPADLET |b| (+ 1 (|zagSub| |u|))) (SPADLET |d| (|appvertline| (|specialChar| '|vbar|) |x| (SPADDIFFERENCE |y| |b|) (SPADDIFFERENCE |y| 1) |d|)) (SPADLET |d| (|appvertline| (|specialChar| '|vbar|) - (SPADDIFFERENCE (PLUS |x| |w|) 1) (PLUS |y| 1) - (PLUS |y| |a|) |d|)) + (SPADDIFFERENCE (+ |x| |w|) 1) (+ |y| 1) + (+ |y| |a|) |d|)) (SPADLET |d| - (|apphor| |x| (SPADDIFFERENCE (PLUS |x| |w|) 2) |y| + (|apphor| |x| (SPADDIFFERENCE (+ |x| |w|) 2) |y| |d| (|specialChar| '|hbar|))) (SPADLET |d| (APP (|specialChar| '|ulc|) |x| |y| |d|)) (SPADLET |d| (APP (|specialChar| '|lrc|) - (SPADDIFFERENCE (PLUS |x| |w|) 1) |y| |d|)))))) + (SPADDIFFERENCE (+ |x| |w|) 1) |y| |d|)))))) ;zagSub(u) == ; height CADR rest u @@ -6288,8 +6288,8 @@ NIL (DEFUN |zagWidth| (|x|) (COND ((EQL (|#| |x|) 1) 0) - ((EQL (|#| |x|) 2) (PLUS 4 (WIDTH (ELT |x| 1)))) - ('T (PLUS 4 (MAX (WIDTH (ELT |x| 1)) (WIDTH (ELT |x| 2))))))) + ((EQL (|#| |x|) 2) (+ 4 (WIDTH (ELT |x| 1)))) + ('T (+ 4 (MAX (WIDTH (ELT |x| 1)) (WIDTH (ELT |x| 2))))))) ;rootWidth(x) == ; #x <= 2 => 3 + WIDTH x.1 @@ -6297,8 +6297,8 @@ NIL (DEFUN |rootWidth| (|x|) (COND - ((<= (|#| |x|) 2) (PLUS 3 (WIDTH (ELT |x| 1)))) - ('T (PLUS (PLUS 2 (WIDTH (ELT |x| 1))) (WIDTH (ELT |x| 2)))))) + ((<= (|#| |x|) 2) (+ 3 (WIDTH (ELT |x| 1)))) + ('T (+ (+ 2 (WIDTH (ELT |x| 1))) (WIDTH (ELT |x| 2)))))) ;rootSub(x) == ; subspan x.1 @@ -6316,14 +6316,14 @@ NIL (PROG (|normal| |radOver|) (RETURN (PROGN - (SPADLET |normal| (PLUS 1 (|superspan| (ELT |x| 1)))) + (SPADLET |normal| (+ 1 (|superspan| (ELT |x| 1)))) (COND ((<= (|#| |x|) 2) |normal|) ((MINUSP (SPADLET |radOver| (SPADDIFFERENCE (|height| (ELT |x| 2)) (|height| (ELT |x| 1))))) |normal|) - ('T (PLUS |normal| |radOver|))))))) + ('T (+ |normal| |radOver|))))))) ;appmat(u, x, y, d) == ; rows := CDDR u @@ -6375,9 +6375,9 @@ NIL (SPADLET |q| (|matSub| |u|)) (SPADLET |d| (|matrixBorder| |x| (SPADDIFFERENCE |y| |q|) - (PLUS |y| |p|) |d| '|left|)) - (SPADLET |x| (PLUS 1 |x|)) - (SPADLET |yc| (PLUS (PLUS 1 |y|) |p|)) + (+ |y| |p|) |d| '|left|)) + (SPADLET |x| (+ 1 |x|)) + (SPADLET |yc| (+ (+ 1 |y|) |p|)) (SPADLET |w| (CADR |u|)) (SPADLET |wl| (CDAR |w|)) (SPADLET |subl| (CDR (CADR |w|))) @@ -6388,9 +6388,9 @@ NIL (RETURN (|matrixBorder| (SPADDIFFERENCE - (PLUS |x| (WIDTH |u|)) 2) + (+ |x| (WIDTH |u|)) 2) (SPADDIFFERENCE |y| |q|) - (PLUS |y| |p|) |d| '|right|))) + (+ |y| |p|) |d| '|right|))) ('T (SPADLET |xc| |x|) (SPADLET |yc| (SPADDIFFERENCE @@ -6432,14 +6432,14 @@ NIL ('T (SPADLET |d| (APP (CAR |row|) - (PLUS |xc| + (+ |xc| (QUOTIENT (SPADDIFFERENCE (CAR |w|) (WIDTH (CAR |row|))) 2)) |yc| |d|)) (SPADLET |xc| - (PLUS (PLUS |xc| 2) + (+ (+ |xc| 2) (CAR |w|))) (SPADLET |row| (CDR |row|)) (SPADLET |w| (CDR |w|)))))))))))))))))) @@ -6451,8 +6451,8 @@ NIL (DEFUN |matSuper| (|x|) (COND ((SPADLET |x| (ELT |x| 1)) - (PLUS (SPADDIFFERENCE 1) - (QUOTIENT (PLUS (CAR (ELT |x| 1)) (CAR (ELT |x| 2))) 2))) + (+ (SPADDIFFERENCE 1) + (QUOTIENT (+ (CAR (ELT |x| 1)) (CAR (ELT |x| 2))) 2))) ('T (ERROR 'MAT)))) ;matSub(x) == @@ -6463,7 +6463,7 @@ NIL (COND ((SPADLET |x| (ELT |x| 1)) (QUOTIENT - (PLUS (PLUS (SPADDIFFERENCE 1) (CAR (ELT |x| 1))) + (+ (+ (SPADDIFFERENCE 1) (CAR (ELT |x| 1))) (CAR (ELT |x| 2))) 2)) ('T (ERROR 'MAT)))) @@ -6497,13 +6497,13 @@ NIL ; CONS(sumoverlist x + LENGTH x, x) (DEFUN |matLSum| (|x|) - (CONS (PLUS (|sumoverlist| |x|) (LENGTH |x|)) |x|)) + (CONS (+ (|sumoverlist| |x|) (LENGTH |x|)) |x|)) ;matLSum2(x) == ; CONS(sumoverlist x + 2*(LENGTH x), x) (DEFUN |matLSum2| (|x|) - (CONS (PLUS (|sumoverlist| |x|) (TIMES 2 (LENGTH |x|))) |x|)) + (CONS (+ (|sumoverlist| |x|) (TIMES 2 (LENGTH |x|))) |x|)) ;matWList(x, y) == ; null x => y @@ -6566,7 +6566,7 @@ NIL ; -1 + sumWidthA rest u (DEFUN |minusWidth| (|u|) - (PLUS (SPADDIFFERENCE 1) (|sumWidthA| (CDR |u|)))) + (+ (SPADDIFFERENCE 1) (|sumWidthA| (CDR |u|)))) ;-- opSrch(name, x) == ;-- LASSOC(name, x) or '"," @@ -6632,8 +6632,8 @@ NIL (COND ((>= (SPADLET |s| - (PLUS - (PLUS |s| + (+ + (+ |s| (WIDTH (CAR |x|))) 1)) |linelength|) @@ -6722,7 +6722,7 @@ NIL ;qTWidth(u) == ; 2 + WIDTH CADR u -(DEFUN |qTWidth| (|u|) (PLUS 2 (WIDTH (CADR |u|)))) +(DEFUN |qTWidth| (|u|) (+ 2 (WIDTH (CADR |u|)))) ;remWidth(x) == ; atom x => x @@ -6750,7 +6750,7 @@ NIL ; 5 + WIDTH u.1 + WIDTH u.2 (DEFUN |letWidth| (|u|) - (PLUS (PLUS 5 (WIDTH (ELT |u| 1))) (WIDTH (ELT |u| 2)))) + (+ (+ 5 (WIDTH (ELT |u| 1))) (WIDTH (ELT |u| 2)))) ;sumoverlist(u) == +/[x for x in u] @@ -6764,13 +6764,13 @@ NIL ((OR (ATOM G170001) (PROGN (SETQ |x| (CAR G170001)) NIL)) G169996) - (SEQ (EXIT (SETQ G169996 (PLUS G169996 |x|))))))))))) + (SEQ (EXIT (SETQ G169996 (+ G169996 |x|))))))))))) ;sumWidth u == ; WIDTH u.1 + sumWidthA CDDR u (DEFUN |sumWidth| (|u|) - (PLUS (WIDTH (ELT |u| 1)) (|sumWidthA| (CDDR |u|)))) + (+ (WIDTH (ELT |u| 1)) (|sumWidthA| (CDDR |u|)))) ;sumWidthA u == ; ^u => 0 @@ -6782,7 +6782,7 @@ NIL (COND ((NULL |u|) 0) ('T - (PLUS (PLUS (COND + (+ (+ (COND ((|member| (|keyp| (|absym| (CAR |u|))) '(+ -)) 5) ('T 3)) (WIDTH (|absym| (CAR |u|)))) @@ -6823,21 +6823,21 @@ NIL (SPADLET |ab| (|subspan| |a|)) (SPADLET |aw| (WIDTH |a|)) (SPADLET |di| - (APP |d| (PLUS |x| (SPADDIFFERENCE |aox| |wd|)) - (PLUS (PLUS (PLUS 1 |ar|) |y|) (|subspan| |d|)) + (APP |d| (+ |x| (SPADDIFFERENCE |aox| |wd|)) + (+ (+ (+ 1 |ar|) |y|) (|subspan| |d|)) |di|)) - (SPADLET |di| (APP |a| (PLUS |x| |aox|) |y| |di|)) + (SPADLET |di| (APP |a| (+ |x| |aox|) |y| |di|)) (SPADLET |di| - (APP |c| (PLUS (PLUS |aox| |aw|) |x|) - (PLUS (PLUS (PLUS 1 |y|) |ar|) (|subspan| |c|)) + (APP |c| (+ (+ |aox| |aw|) |x|) + (+ (+ (+ 1 |y|) |ar|) (|subspan| |c|)) |di|)) (SPADLET |di| - (APP |e| (PLUS |x| (SPADDIFFERENCE |aox| |we|)) + (APP |e| (+ |x| (SPADDIFFERENCE |aox| |we|)) (SPADDIFFERENCE (SPADDIFFERENCE |y| 1) (MAX (|superspan| |e|) |ab|)) |di|)) (SPADLET |di| - (APP |b| (PLUS (PLUS |aox| |aw|) |x|) + (APP |b| (+ (+ |aox| |aw|) |x|) (SPADDIFFERENCE (SPADDIFFERENCE |y| 1) (MAX |ab| (|superspan| |b|))) |di|)) @@ -6872,7 +6872,7 @@ NIL (SPADLET |b| (KAR (SPADLET |u| (KDR |u|)))) (SPADLET |e| (KAR (KDR (KDR (KDR |u|))))) (RETURN - (PLUS (|subspan| |a|) (MAX (|height| |b|) (|height| |e|)))))))) + (+ (|subspan| |a|) (MAX (|height| |b|) (|height| |e|)))))))) ;binomApp(u,x,y,d) == ; [num,den] := rest u @@ -6908,35 +6908,35 @@ NIL (SPADLET |ysub| (SPADDIFFERENCE (SPADDIFFERENCE |y| 1) (|superspan| |den|))) - (SPADLET |ysup| (PLUS (PLUS |y| 1) (|subspan| |num|))) + (SPADLET |ysup| (+ (+ |y| 1) (|subspan| |num|))) (SPADLET |wden| (WIDTH |den|)) (SPADLET |wnum| (WIDTH |num|)) (SPADLET |w| (MAX |wden| |wnum|)) (SPADLET |d| (APP |den| - (PLUS (PLUS |x| 1) + (+ (+ |x| 1) (QUOTIENT (SPADDIFFERENCE |w| |wden|) 2)) |ysub| |d|)) (SPADLET |d| (APP |num| - (PLUS (PLUS |x| 1) + (+ (+ |x| 1) (QUOTIENT (SPADDIFFERENCE |w| |wnum|) 2)) |ysup| |d|)) (SPADLET |hnum| (|height| |num|)) (SPADLET |hden| (|height| |den|)) - (SPADLET |w| (PLUS 1 |w|)) + (SPADLET |w| (+ 1 |w|)) (DO ((G170072 (SPADDIFFERENCE |hnum| 1)) (|j| 0 (QSADD1 |j|))) ((QSGREATERP |j| G170072) NIL) (SEQ (EXIT (PROGN (SPADLET |d| (|appChar| (|specialChar| '|vbar|) - |x| (PLUS |y| |j|) |d|)) + |x| (+ |y| |j|) |d|)) (SPADLET |d| (|appChar| (|specialChar| '|vbar|) - (PLUS |x| |w|) (PLUS |y| |j|) + (+ |x| |w|) (+ |y| |j|) |d|)))))) (DO ((G170081 (SPADDIFFERENCE |hden| 1)) (|j| 1 (QSADD1 |j|))) @@ -6947,19 +6947,19 @@ NIL |x| (SPADDIFFERENCE |y| |j|) |d|)) (SPADLET |d| (|appChar| (|specialChar| '|vbar|) - (PLUS |x| |w|) + (+ |x| |w|) (SPADDIFFERENCE |y| |j|) |d|)))))) (SPADLET |d| (|appChar| (|specialChar| '|ulc|) |x| - (PLUS |y| |hnum|) |d|)) + (+ |y| |hnum|) |d|)) (SPADLET |d| - (|appChar| (|specialChar| '|urc|) (PLUS |x| |w|) - (PLUS |y| |hnum|) |d|)) + (|appChar| (|specialChar| '|urc|) (+ |x| |w|) + (+ |y| |hnum|) |d|)) (SPADLET |d| (|appChar| (|specialChar| '|llc|) |x| (SPADDIFFERENCE |y| |hden|) |d|)) (SPADLET |d| - (|appChar| (|specialChar| '|lrc|) (PLUS |x| |w|) + (|appChar| (|specialChar| '|lrc|) (+ |x| |w|) (SPADDIFFERENCE |y| |hden|) |d|))))))) ;binomSub u == height CADDR u @@ -6973,7 +6973,7 @@ NIL ;binomWidth u == 2 + MAX(WIDTH CADR u, WIDTH CADDR u) (DEFUN |binomWidth| (|u|) - (PLUS 2 (MAX (WIDTH (CADR |u|)) (WIDTH (CADDR |u|))))) + (+ 2 (MAX (WIDTH (CADR |u|)) (WIDTH (CADDR |u|))))) ;altSuperSubApp(u, x, y, di) == ; a := first (u := rest u) @@ -7004,7 +7004,7 @@ NIL (SPADLET |ab| (|subspan| |a|)) (SPADLET |aw| (WIDTH |a|)) (SPADLET |di| (APP |a| |x| |y| |di|)) - (SPADLET |x| (PLUS |x| |aw|)) + (SPADLET |x| (+ |x| |aw|)) (SPADLET |sublist| (|everyNth| (SPADLET |u| (CDR |u|)) 2)) (SPADLET |suplist| (|everyNth| (IFCDR |u|) 2)) (SPADLET |ysub| @@ -7030,7 +7030,7 @@ NIL (CONS (|superspan| |s|) G170124))))))))))) (SPADLET |ysup| - (PLUS (PLUS |y| 1) + (+ (+ |y| 1) (APPLY 'MAX (CONS |ar| (PROG (G170139) @@ -7063,7 +7063,7 @@ NIL (SPADLET |di| (APP |sub| |x| |ysub| |di|)) (SPADLET |di| (APP |sup| |x| |ysup| |di|)) (SPADLET |x| - (PLUS (PLUS |x| 1) + (+ (+ |x| 1) (MAX |wsub| |wsup|))))))) |di|))))) @@ -7168,7 +7168,7 @@ NIL (SPADLET |wsup| (WIDTH |sup|)) (SPADLET |wsub| (WIDTH |sub|)) (SPADLET |w| - (PLUS (PLUS |w| 1) + (+ (+ |w| 1) (MAX |wsup| |wsub|))))))) |w|))))) @@ -7192,7 +7192,7 @@ NIL (OR (KAR (SPADLET |u| (KDR |u|))) '((NOTHING . 0)))) (SPADLET |e| (OR (KADR |u|) '((NOTHING . 0)))) (RETURN - (PLUS (PLUS (MAX (WIDTH |d|) (WIDTH |e|)) + (+ (+ (MAX (WIDTH |d|) (WIDTH |e|)) (MAX (WIDTH |b|) (WIDTH |c|))) (WIDTH |a|))))))) @@ -7210,13 +7210,13 @@ NIL (SPADLET |c| (KAR (SPADLET |u| (KDR (KDR |u|))))) (SPADLET |d| (KADR |u|)) (RETURN - (PLUS (|superspan| |a|) (MAX (|height| |c|) (|height| |d|)))))))) + (+ (|superspan| |a|) (MAX (|height| |c|) (|height| |d|)))))))) ;suScWidth u == ; WIDTH u.1 + aggwidth CDDR u (DEFUN |suScWidth| (|u|) - (PLUS (WIDTH (ELT |u| 1)) (|aggwidth| (CDDR |u|)))) + (+ (WIDTH (ELT |u| 1)) (|aggwidth| (CDDR |u|)))) ;transcomparg(x) == ; y := first x @@ -7244,7 +7244,7 @@ NIL (SEQ (PROGN (SPADLET |y| (CAR |x|)) (SPADLET |args| - (CAR (*NTH STANDARGLIST (PLUS 1 (LENGTH |y|))))) + (CAR (*NTH STANDARGLIST (+ 1 (LENGTH |y|))))) (DO () (NIL NIL) (SEQ (EXIT (PROGN (COND @@ -7296,7 +7296,7 @@ NIL (SEQ (PROGN (SPADLET |w| (|vConcatWidth| |u|)) (SPADLET |y| - (PLUS (PLUS |y| (|superspan| (ELT |u| 1))) 1)) + (+ (+ |y| (|superspan| (ELT |u| 1))) 1)) (DO ((G170351 (CDR |u|) (CDR G170351)) (|a| NIL)) ((OR (ATOM G170351) (PROGN (SETQ |a| (CAR G170351)) NIL)) @@ -7312,7 +7312,7 @@ NIL (SPADDIFFERENCE |w| (WIDTH |a|)) 2)) (SPADLET |d| - (APP |a| (PLUS |x| |xoff|) |y| + (APP |a| (+ |x| |xoff|) |y| |d|)) (SPADLET |y| (SPADDIFFERENCE |y| @@ -7341,14 +7341,14 @@ NIL (SPADLET |a| (CADDR |u|)) (SPADLET |w| (|vConcatWidth| |u|)) (SPADLET |d| (APP "(" |x| |y| |d|)) - (SPADLET |x| (PLUS |x| 1)) + (SPADLET |x| (+ |x| 1)) (SPADLET |y1| (SPADDIFFERENCE |y| (|height| |a|))) (SPADLET |xoff| (QUOTIENT (SPADDIFFERENCE |w| (WIDTH |a|)) 2)) - (SPADLET |d| (APP |a| (PLUS |x| |xoff|) |y1| |d|)) - (SPADLET |y2| (PLUS |y| (|height| |b|))) + (SPADLET |d| (APP |a| (+ |x| |xoff|) |y1| |d|)) + (SPADLET |y2| (+ |y| (|height| |b|))) (SPADLET |xoff| (QUOTIENT (SPADDIFFERENCE |w| (WIDTH |b|)) 2)) - (SPADLET |d| (APP |b| (PLUS |x| |xoff|) |y2| |d|)) - (SPADLET |x| (PLUS |x| |w|)) + (SPADLET |d| (APP |b| (+ |x| |xoff|) |y2| |d|)) + (SPADLET |x| (+ |x| |w|)) (APP ")" |x| |y| |d|))))) ;vConcatSub u == @@ -7357,7 +7357,7 @@ NIL (DEFUN |vConcatSub| (|u|) (PROG () (RETURN - (SEQ (PLUS (|subspan| (ELT |u| 1)) + (SEQ (+ (|subspan| (ELT |u| 1)) (PROG (G170385) (SPADLET G170385 0) (RETURN @@ -7367,7 +7367,7 @@ NIL (PROGN (SETQ |a| (CAR G170390)) NIL)) G170385) (SEQ (EXIT (SETQ G170385 - (PLUS G170385 (|height| |a|))))))))))))) + (+ G170385 (|height| |a|))))))))))))) ;vConcatSuper u == ; superspan u.1 @@ -7396,16 +7396,16 @@ NIL ;binomialSub u == height u.2 + 1 -(DEFUN |binomialSub| (|u|) (PLUS (|height| (ELT |u| 2)) 1)) +(DEFUN |binomialSub| (|u|) (+ (|height| (ELT |u| 2)) 1)) ;binomialSuper u == height u.1 + 1 -(DEFUN |binomialSuper| (|u|) (PLUS (|height| (ELT |u| 1)) 1)) +(DEFUN |binomialSuper| (|u|) (+ (|height| (ELT |u| 1)) 1)) ;binomialWidth u == 2 + MAX(WIDTH u.1, WIDTH u.2) (DEFUN |binomialWidth| (|u|) - (PLUS 2 (MAX (WIDTH (ELT |u| 1)) (WIDTH (ELT |u| 2))))) + (+ 2 (MAX (WIDTH (ELT |u| 1)) (WIDTH (ELT |u| 2))))) ;mathPrint u == ; if ^$collectOutput then TERPRI $algebraOutputStream diff --git a/src/interp/i-spec1.lisp.pamphlet b/src/interp/i-spec1.lisp.pamphlet index 207875e..32f30e4 100644 --- a/src/interp/i-spec1.lisp.pamphlet +++ b/src/interp/i-spec1.lisp.pamphlet @@ -337,7 +337,7 @@ There are several special modes used in these functions: |$anonymousMapCounter| "internal")) (SPADLET |$anonymousMapCounter| - (PLUS 1 |$anonymousMapCounter|)) + (+ 1 |$anonymousMapCounter|)) (SPADLET |$compilingMap| 'T) (SPADLET |$mapThrowCount| 0) (SPADLET |$mapReturnTypes| NIL) @@ -4933,7 +4933,7 @@ There are several special modes used in these functions: (COND ((NULL |margs|) 0) ((CONSP |margs|) - (PLUS (SPADDIFFERENCE 1) (|#| |margs|))) + (+ (SPADDIFFERENCE 1) (|#| |margs|))) ('T 1))) (COND ((NEQUAL |nargs| (|#| |args|)) diff --git a/src/interp/i-spec2.lisp.pamphlet b/src/interp/i-spec2.lisp.pamphlet index 46d681e..a5a2ecf 100644 --- a/src/interp/i-spec2.lisp.pamphlet +++ b/src/interp/i-spec2.lisp.pamphlet @@ -1513,7 +1513,7 @@ There are several special modes used in these functions: (|throwKeyedMsg| "A(n) %1 statement may only be used within a repeat loop." (CONS "iterate" NIL))) - ('T (SPADLET |$iterateCount| (PLUS |$iterateCount| 1)) + ('T (SPADLET |$iterateCount| (+ |$iterateCount| 1)) (SPADLET |code| (CONS 'THROW (CONS |$repeatBodyLabel| @@ -1549,7 +1549,7 @@ There are several special modes used in these functions: (|throwKeyedMsg| "A(n) %1 statement may only be used within a repeat loop." (CONS "break" NIL))) - ('T (SPADLET |$breakCount| (PLUS |$breakCount| 1)) + ('T (SPADLET |$breakCount| (+ |$breakCount| 1)) (SPADLET |code| (CONS 'THROW (CONS |$repeatLabel| (CONS '(|voidValue|) NIL)))) @@ -3457,7 +3457,7 @@ There are several special modes used in these functions: NIL) NIL))) NIL)))) - (SPADCATCH (|eval| |$repeatLabel|) + (catch (|eval| |$repeatLabel|) (|timedEVALFUN| |code|)) (SPADLET |val| (mkObjWrap (|voidValue|) |repeatMode|)) (|putValue| |op| |val|) @@ -3576,7 +3576,7 @@ There are several special modes used in these functions: (SPADLET |m| (|computedMode| |val|)))) (SPADLET |cn| (|mapCatchName| |$mapName|)) (SPADLET |$mapReturnTypes| (|insert| |m| |$mapReturnTypes|)) - (SPADLET |$mapThrowCount| (PLUS |$mapThrowCount| 1)) + (SPADLET |$mapThrowCount| (+ |$mapThrowCount| 1)) (COND (|$genValue| (THROW |cn| (mkObjWrap (|removeQuote| |val'|) |m|))) diff --git a/src/interp/i-util.lisp.pamphlet b/src/interp/i-util.lisp.pamphlet index 3f6ad79..36ca90e 100644 --- a/src/interp/i-util.lisp.pamphlet +++ b/src/interp/i-util.lisp.pamphlet @@ -243,7 +243,7 @@ lisp code is unwrapped. (SPADLET |$variableNumberAlist| (CONS (CONS |x| 0) |$variableNumberAlist|)) 0) - ('T (RPLACD |p| (PLUS 1 (CDR |p|))) (CDR |p|))))))) + ('T (RPLACD |p| (+ 1 (CDR |p|))) (CDR |p|))))))) ;-- functions used at run-time which were formerly in the compiler files ;Undef(:u) == diff --git a/src/interp/match.lisp.pamphlet b/src/interp/match.lisp.pamphlet index 7e015f6..74e41e6 100644 --- a/src/interp/match.lisp.pamphlet +++ b/src/interp/match.lisp.pamphlet @@ -147,7 +147,7 @@ (SEQ (EXIT (COND ((BOOT-EQUAL |c| (ELT |t| |i|)) (RETURN NIL)) - ('T (SPADLET |k| (PLUS |k| 1))))))) + ('T (SPADLET |k| (+ |k| 1))))))) |k|))))))) ;rightCharPosition(c,t,startpos) == --startpos often equals MAXINDEX t (rightmost) @@ -333,7 +333,7 @@ (IF (> |k| |n|) (EXIT (RETURN (NREVERSE |acc|)))) (SPADLET |acc| (CONS |k| |acc|)) - (EXIT (SPADLET |i| (PLUS |k| 1)))))))))) + (EXIT (SPADLET |i| (+ |k| 1)))))))))) (DEFUN |patternCheck,subWild| (|s| |i|) (PROG (|k|) @@ -344,22 +344,22 @@ (EXIT (STRCONC (SUBSTRING |s| |i| (SPADDIFFERENCE |k| |i|)) |$wildCard| - (|patternCheck,subWild| |s| (PLUS |k| 1))))) + (|patternCheck,subWild| |s| (+ |k| 1))))) (EXIT (SUBSTRING |s| |i| NIL)))))) (DEFUN |patternCheck,mknew| (|old| |i| |r| |new|) - (SEQ (SPADLET |new| (STRCONC |new| (ELT |old| (PLUS |i| 1)))) + (SEQ (SPADLET |new| (STRCONC |new| (ELT |old| (+ |i| 1)))) (IF (NULL |r|) (EXIT (STRCONC |new| (|patternCheck,subWild| - (SUBSTRING |old| (PLUS |i| 2) NIL) 0)))) + (SUBSTRING |old| (+ |i| 2) NIL) 0)))) (EXIT (|patternCheck,mknew| |old| (CAR |r|) (CDR |r|) (STRCONC |new| (|patternCheck,subWild| - (SUBSTRING |old| (PLUS |i| 2) + (SUBSTRING |old| (+ |i| 2) (SPADDIFFERENCE (SPADDIFFERENCE (CAR |r|) |i|) 1)) - (PLUS |i| 1))))))) + (+ |i| 1))))))) (DEFUN |patternCheck| (|pattern|) (PROG (|$oldWild| |u| |c|) @@ -383,7 +383,7 @@ (SEQ (EXIT (SETQ G166274 (AND G166274 (|patternCheck,equal| - |pattern| (PLUS |i| 1) + |pattern| (+ |i| 1) |$wildCard|))))))))) (|sayBrightly| (CONS "Invalid use of underscores in pattern: " @@ -426,7 +426,7 @@ (COND ((SPADLET |k| (|basicMatch?| |pattern| (DOWNCASE |subject|))) - (PLUS |k| 1)) + (+ |k| 1)) ('T 0))))))) ;basicMatch?(pattern,target) == @@ -481,13 +481,13 @@ (SPADLET |i| |p|) (SPADLET |q| (|charPosition| |$wildCard| |pattern| - (PLUS |p| 1))) + (+ |p| 1))) (SPADLET |ltarget| (|#| |target|)) (DO () ((NULL (NEQUAL |q| |n|)) NIL) (SEQ (EXIT (PROGN (SPADLET |s| (SUBSTRING |pattern| - (PLUS |p| 1) + (+ |p| 1) (SPADDIFFERENCE (SPADDIFFERENCE |q| |p|) 1))) (SPADLET |i| @@ -501,18 +501,18 @@ (COND ((BOOT-EQUAL |i| |ltarget|) (RETURN (SPADLET |returnFlag| 'T)))) - (SPADLET |i| (PLUS |i| (|#| |s|))) + (SPADLET |i| (+ |i| (|#| |s|))) (SPADLET |p| |q|) (SPADLET |q| (|charPosition| |$wildCard| - |pattern| (PLUS |q| 1))))))) + |pattern| (+ |q| 1))))))) (COND (|returnFlag| NIL) ('T (COND ((NEQUAL |p| (SPADDIFFERENCE |q| 1)) (SPADLET |s| - (SUBSTRING |pattern| (PLUS |p| 1) + (SUBSTRING |pattern| (+ |p| 1) (SPADDIFFERENCE (SPADDIFFERENCE |q| |p|) 1))) (COND @@ -574,7 +574,7 @@ (COND ((BOOT-EQUAL |m| (|#| |target|)) NIL) ((NULL |nc|) 'T) - ('T (<= |m| (SPADDIFFERENCE (PLUS |k| |nc|) |n|))))) + ('T (<= |m| (SPADDIFFERENCE (+ |k| |nc|) |n|))))) ('T (COND ((AND (NEQUAL |k| 0) |nc|) @@ -588,16 +588,16 @@ (RETURN NIL)))) ((EQL |n| 1) (RETURN 'T)) ('T NIL)) - (SPADLET |i| (PLUS |p| |k|)) + (SPADLET |i| (+ |p| |k|)) (SPADLET |q| (|charPosition| |$wildCard| |pattern| - (PLUS |p| 1))) + (+ |p| 1))) (SPADLET |ltarget| (|#| |target|)) (DO () ((NULL (NEQUAL |q| |n|)) NIL) (SEQ (EXIT (PROGN (SPADLET |s| (SUBSTRING |pattern| - (PLUS |p| 1) + (+ |p| 1) (SPADDIFFERENCE (SPADDIFFERENCE |q| |p|) 1))) (SPADLET |i| @@ -606,18 +606,18 @@ (COND ((BOOT-EQUAL |i| |ltarget|) (RETURN (SPADLET |returnFlag| 'T)))) - (SPADLET |i| (PLUS |i| (|#| |s|))) + (SPADLET |i| (+ |i| (|#| |s|))) (SPADLET |p| |q|) (SPADLET |q| (|charPosition| |$wildCard| - |pattern| (PLUS |q| 1))))))) + |pattern| (+ |q| 1))))))) (COND (|returnFlag| NIL) ('T (COND ((NEQUAL |p| (SPADDIFFERENCE |q| 1)) (SPADLET |s| - (SUBSTRING |pattern| (PLUS |p| 1) + (SUBSTRING |pattern| (+ |p| 1) (SPADDIFFERENCE (SPADDIFFERENCE |q| |p|) 1))) (COND @@ -628,7 +628,7 @@ ;infix?(s,t,x) == #s + #t >= #x and prefix?(s,x) and suffix?(t,x) (DEFUN |infix?| (|s| |t| |x|) - (AND (>= (PLUS (|#| |s|) (|#| |t|)) (|#| |x|)) (|prefix?| |s| |x|) + (AND (>= (+ (|#| |s|) (|#| |t|)) (|#| |x|)) (|prefix?| |s| |x|) (|suffix?| |t| |x|))) ;prefix?(s,t) == substring?(s,t,0) diff --git a/src/interp/msgdb.lisp.pamphlet b/src/interp/msgdb.lisp.pamphlet index 31923b6..85a6432 100644 --- a/src/interp/msgdb.lisp.pamphlet +++ b/src/interp/msgdb.lisp.pamphlet @@ -86,15 +86,15 @@ (COND ((BOOT-EQUAL |c| (|char| '_)) (ELT |l| - (setq |k| (PLUS 1 |k|)))) + (setq |k| (+ 1 |k|)))) ('T |c|))) (setq |buf| (STRCONC |buf| |ch|)) - (setq |k| (PLUS |k| 1)))))) + (setq |k| (+ |k| 1)))))) (COND ((AND (BOOT-EQUAL |k| |maxIndex|) (NEQUAL (setq |c| (ELT |l| |k|)) (|char| '| |))) (setq |buf| (STRCONC |buf| |c|)))) - (cons |buf| (cons (PLUS |k| 1) nil))))))) + (cons |buf| (cons (+ |k| 1) nil))))))) ;segmentedMsgPreprocess x == ; ATOM x => x @@ -871,27 +871,27 @@ (setq |lnl| 199999)) ((|member| |f| '("%i" |%i|)) (setq |potentialMarg| - (PLUS |potentialMarg| 3)) + (+ |potentialMarg| 3)) (setq |nl| (cons |f| |nl|))) ((AND (consp |f|) (|member| (CAR |f|) '("%t" |%t|))) (setq |potentialMarg| - (PLUS |potentialMarg| + (+ |potentialMarg| (CDR |f|))) (setq |nl| (cons |f| |nl|))) ('T (setq |sbl| (|sayBrightlyLength| |f|)) (setq |tot| - (PLUS - (PLUS (PLUS |lnl| |offset|) + (+ + (+ (+ |lnl| |offset|) |sbl|) |actualMarg|)) (COND (|firstLine| (setq |firstLine| nil) (setq |offset| - (PLUS |offset| |offset|)) + (+ |offset| |offset|)) (setq |off1| (STRCONC |off| |off1|)) (setq |off| @@ -901,7 +901,7 @@ (AND (EQL |sbl| 1) (BOOT-EQUAL |tot| |len|))) (setq |nl| (cons |f| |nl|)) - (setq |lnl| (PLUS |lnl| |sbl|))) + (setq |lnl| (+ |lnl| |sbl|))) ((|member| |f| '(| | " ")) (setq |nl| @@ -910,8 +910,8 @@ (setq |actualMarg| |potentialMarg|) (setq |lnl| - (PLUS - (PLUS (SPADDIFFERENCE 1) + (+ + (+ (SPADDIFFERENCE 1) |offset|) |sbl|))) ('T @@ -919,7 +919,7 @@ (cons |f| (cons |off| (cons '|%l| |nl|)))) (setq |lnl| - (PLUS |offset| |sbl|))))))))) + (+ |offset| |sbl|))))))))) (|concat| (NREVERSE |nl|))) ('T (|concat| '|%l| |off| |msg|))))))))) @@ -1125,7 +1125,7 @@ ((QSGREATERP |i| $MARG) nil) (SEQ (EXIT (|sayString| " "))))) ((BOOT-EQUAL |x| "%i") - (setq $MARG (PLUS $MARG 3))) + (setq $MARG (+ $MARG 3))) ((BOOT-EQUAL |x| "%u") (setq $MARG (SPADDIFFERENCE $MARG 3)) (COND ((MINUSP $MARG) (setq $MARG 0)) ('T nil))) @@ -1175,7 +1175,7 @@ (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| $MARG) nil) (SEQ (EXIT (|sayString| "\\ "))))) ((BOOT-EQUAL |x| "%i") - (setq $MARG (PLUS $MARG 3))) + (setq $MARG (+ $MARG 3))) ((BOOT-EQUAL |x| "%u") (setq $MARG (SPADDIFFERENCE $MARG 3)) (COND ((MINUSP $MARG) (setq $MARG 0)) ('T nil))) @@ -1280,7 +1280,7 @@ ((BOOT-EQUAL |key| "%rj") (|brightPrintRightJustify| |rst|)) ((BOOT-EQUAL |key| "%t") - (setq $MARG (PLUS $MARG (|tabber| |rst|)))) + (setq $MARG (+ $MARG (|tabber| |rst|)))) ('T (|sayString| "(") (|brightPrint1| |key|) (COND @@ -1352,7 +1352,7 @@ ((BOOT-EQUAL |key| "%ce") (|brightPrintCenter| |rst|)) ((BOOT-EQUAL |key| "%t") - (setq $MARG (PLUS $MARG (|tabber| |rst|)))) + (setq $MARG (+ $MARG (|tabber| |rst|)))) ('T (|sayString| "(") (|brightPrint1| |key|) (COND @@ -1619,7 +1619,7 @@ ((NULL |l|) 0) ((ATOM |l|) (|sayBrightlyLength1| |l|)) ('T - (PLUS (|sayBrightlyLength1| (CAR |l|)) + (+ (|sayBrightlyLength1| (CAR |l|)) (|sayBrightlyLength| (CDR |l|)))))) ;sayBrightlyLength1 x == @@ -1651,7 +1651,7 @@ ((IDENTP |x|) (STRINGLENGTH (PNAME |x|))) ((VECP |x|) (STRINGLENGTH "UNPRINTABLE")) ((ATOM |x|) (STRINGLENGTH (STRINGIMAGE |x|))) - ('T (PLUS 2 (|sayBrightlyLength| |x|))))) + ('T (+ 2 (|sayBrightlyLength| |x|))))) ;sayAsManyPerLineAsPossible l == ; -- it is assumed that l is a list of strings @@ -1693,7 +1693,7 @@ (cons (|atom2String| |a|) G166958)))))))) (setq |m| - (PLUS 1 + (+ 1 (PROG (G166969) (setq G166969 -999999) (RETURN @@ -1715,7 +1715,7 @@ nil) (SEQ (EXIT (|sayMSG| |a|)))) nil) - ('T (setq |w| (MIN (PLUS |m| 3) $LINELENGTH)) + ('T (setq |w| (MIN (+ |m| 3) $LINELENGTH)) (setq |p| (QUOTIENT $LINELENGTH |w|)) (setq |n| (|#| |l|)) (setq |str| "") (DO ((G166999 (SPADDIFFERENCE |n| 1)) @@ -1732,7 +1732,7 @@ (|#| |c|)) " "))) (COND - ((EQL (REMAINDER (PLUS |i| 1) |p|) 0) + ((EQL (REMAINDER (+ |i| 1) |p|) 0) (PROGN (|sayMSG| |str|) (setq |str| "")))))))) @@ -1812,7 +1812,7 @@ (setq |back| (QCAR |ISTMP#2|)) 'T)))))) (|sayBrightly| |front|) - (BLANKS (PLUS 6 (|#| (PNAME (ELT |front| 1))))) + (BLANKS (+ 6 (|#| (PNAME (ELT |front| 1))))) (|sayBrightly| |back|)) ('T (|sayBrightly| |x|)))))) @@ -1902,7 +1902,7 @@ (PROGN (SETQ |y| (CAR G167128)) nil)) G167123) (SEQ (EXIT (SETQ G167123 - (PLUS G167123 + (+ G167123 (|sayDisplayWidth,fn| |y|))))))))) ((OR (BOOT-EQUAL |x| '%%) (BOOT-EQUAL |x| "%%")) @@ -1930,7 +1930,7 @@ (PROGN (SETQ |y| (CAR G167148)) nil)) G167143) (SEQ (EXIT (SETQ G167143 - (PLUS G167143 + (+ G167143 (|sayWidth,fn| |y|)))))))))))))) ;pp2Cols(al) == diff --git a/src/interp/nag-c02.lisp.pamphlet b/src/interp/nag-c02.lisp.pamphlet index a5dd910..53b8ef3 100644 --- a/src/interp/nag-c02.lisp.pamphlet +++ b/src/interp/nag-c02.lisp.pamphlet @@ -127,7 +127,7 @@ (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE - (PLUS (SPADDIFFERENCE |n| |i|) 1)) + (+ (SPADDIFFERENCE |n| |i|) 1)) "\\space{1}")) (SPADLET |post| "\\tab{30} ") (SPADLET |post| (STRCONC |post| "\\space{1}")) @@ -185,7 +185,7 @@ (PROG (G166076) (SPADLET G166076 NIL) (RETURN - (DO ((G166081 (PLUS |n| 1)) + (DO ((G166081 (+ |n| 1)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166081) G166076) (SEQ (EXIT @@ -469,7 +469,7 @@ (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE - (PLUS (SPADDIFFERENCE |n| |i|) 1)) + (+ (SPADDIFFERENCE |n| |i|) 1)) "\\space{1}")) (SPADLET |rnam| (INTERN (STRCONC "r" @@ -514,7 +514,7 @@ (PROG (G166149) (SPADLET G166149 NIL) (RETURN - (DO ((G166154 (PLUS |n| 1)) + (DO ((G166154 (+ |n| 1)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166154) G166149) (SEQ (EXIT diff --git a/src/interp/nag-c05.lisp.pamphlet b/src/interp/nag-c05.lisp.pamphlet index d5902a9..734599c 100644 --- a/src/interp/nag-c05.lisp.pamphlet +++ b/src/interp/nag-c05.lisp.pamphlet @@ -543,7 +543,7 @@ (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN (COND - ((> (PLUS |n| 1) |i|) + ((> (+ |n| 1) |i|) (SPADLET |temp1| (STRCONC (ELT (CAR |y|) 1) '| |)) @@ -553,11 +553,11 @@ (SPADLET |temp2list| (CONS |temp2| |temp2list|)))) (SPADLET |y| (CDR |y|)) - (SPADLET |i| (PLUS |i| 1)))))) + (SPADLET |i| (+ |i| 1)))))) (SPADLET |string1| (|bcwords2liststring| |temp1list|)) (SPADLET |string2| (|bcwords2liststring| |temp2list|)) (SPADLET |lwa| - (QUOTIENT (TIMES |n| (PLUS (TIMES 3 |n|) 13)) 2)) + (QUOTIENT (TIMES |n| (+ (TIMES 3 |n|) 13)) 2)) (SPADLET |prefix| (STRCONC '|c05nbf(| (STRINGIMAGE |n|) '|,| (STRINGIMAGE |lwa|) '|,[| |string1| @@ -950,7 +950,7 @@ (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN (COND - ((> (PLUS |n| 1) |i|) + ((> (+ |n| 1) |i|) (SPADLET |temp1| (STRCONC (ELT (CAR |y|) 1) '| |)) @@ -960,10 +960,10 @@ (SPADLET |temp2list| (CONS |temp2| |temp2list|)))) (SPADLET |y| (CDR |y|)) - (SPADLET |i| (PLUS |i| 1)))))) + (SPADLET |i| (+ |i| 1)))))) (SPADLET |string1| (|bcwords2liststring| |temp1list|)) (SPADLET |string2| (|bcwords2liststring| |temp2list|)) - (SPADLET |lwa| (QUOTIENT (TIMES |n| (PLUS |n| 13)) 2)) + (SPADLET |lwa| (QUOTIENT (TIMES |n| (+ |n| 13)) 2)) (SPADLET |prefix| (STRCONC '|c05pbf(| (STRINGIMAGE |n|) '|,| (STRINGIMAGE |n|))) diff --git a/src/interp/nag-d02.lisp.pamphlet b/src/interp/nag-d02.lisp.pamphlet index 0194617..4b1afa6 100644 --- a/src/interp/nag-d02.lisp.pamphlet +++ b/src/interp/nag-d02.lisp.pamphlet @@ -466,7 +466,7 @@ (SPADLET |numberOfPoints| (COND ((ZEROP (LENGTH |outp|)) 1) - ('T (PLUS 2 (COUNT (CHARACTER 44) |outp|))))) + ('T (+ 2 (COUNT (CHARACTER 44) |outp|))))) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |n|) NIL) (SEQ (EXIT (PROGN (SPADLET |ytemp| @@ -1468,7 +1468,7 @@ (SPADLET |numberOfPoints| (COND ((ZEROP (LENGTH |outp|)) 1) - ('T (PLUS 2 (COUNT (CHARACTER 44) |outp|))))) + ('T (+ 2 (COUNT (CHARACTER 44) |outp|))))) (SPADLET |y| (CDR |y|)) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |n|) NIL) (SEQ (EXIT (PROGN @@ -1739,7 +1739,7 @@ ((BOOT-EQUAL |control| '|abs|) "A") ('T "R"))) - (SPADLET |iw| (PLUS (TIMES (PLUS |n| 12) |n|) 50)) + (SPADLET |iw| (+ (TIMES (+ |n| 12) |n|) 50)) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -2007,7 +2007,7 @@ (SPADLET |numberOfPoints| (COND ((ZEROP (LENGTH |outp|)) 1) - ('T (PLUS 2 (COUNT (CHARACTER 44) |outp|))))) + ('T (+ 2 (COUNT (CHARACTER 44) |outp|))))) (SPADLET |y| (CDR |y|)) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |n|) NIL) (SEQ (EXIT (PROGN @@ -2404,17 +2404,17 @@ (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|np|))))) (SPADLET |lw| - (PLUS (PLUS (TIMES |mnp| - (PLUS - (PLUS + (+ (+ (TIMES |mnp| + (+ + (+ (TIMES (TIMES 3 |n|) |n|) (TIMES 6 |n|)) 2)) (TIMES (TIMES 4 |n|) |n|)) (TIMES 4 |n|))) (SPADLET |liw| - (PLUS (PLUS (PLUS (TIMES |mnp| - (PLUS (TIMES 2 |n|) 1)) + (+ (+ (+ (TIMES |mnp| + (+ (TIMES 2 |n|) 1)) (TIMES |n| |n|)) (TIMES 4 |n|)) 2)) @@ -2435,7 +2435,7 @@ ((BOOT-EQUAL |cerror| '|cone|) '1) ('T '0))) (SPADLET |ifail| - (PLUS (PLUS (TIMES 100 |cfail|) + (+ (+ (TIMES 100 |cfail|) (TIMES 10 |bfail|)) |afail|)) (COND @@ -3362,16 +3362,16 @@ (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|np|))))) (SPADLET |lw| - (PLUS (PLUS (TIMES |mnp| - (PLUS - (PLUS + (+ (+ (TIMES |mnp| + (+ + (+ (TIMES (TIMES 3 |n|) |n|) (TIMES 5 |n|)) 2)) (TIMES (TIMES 3 |n|) |n|)) (TIMES 5 |n|))) (SPADLET |liw| - (PLUS (TIMES |mnp| (PLUS (TIMES 2 |n|) 1)) |n|)) + (+ (TIMES |mnp| (+ (TIMES 2 |n|) 1)) |n|)) (SPADLET |tol| (|htpLabelInputString| |htPage| '|tol|)) (SPADLET |aerror| (|htpButtonValue| |htPage| '|afail|)) (SPADLET |afail| @@ -3389,7 +3389,7 @@ ((BOOT-EQUAL |cerror| '|cone|) '1) ('T '0))) (SPADLET |ifail| - (PLUS (PLUS (TIMES 100 |cfail|) + (+ (+ (TIMES 100 |cfail|) (TIMES 10 |bfail|)) |afail|)) (COND @@ -5261,9 +5261,9 @@ (SPADLET |deleps| (|htpLabelInputString| |htPage| '|deleps|)) (SPADLET |lwork| - (PLUS (PLUS (TIMES |mnp| - (PLUS - (PLUS + (+ (+ (TIMES |mnp| + (+ + (+ (TIMES (TIMES 3 |n|) |n|) (TIMES 6 |n|)) 2)) @@ -5272,14 +5272,14 @@ (SPADLET |liwork| (COND ((EQL |ijac| 0) - (PLUS (PLUS (PLUS + (+ (+ (+ (TIMES |mnp| - (PLUS (TIMES 2 |n|) 1)) + (+ (TIMES 2 |n|) 1)) (TIMES |n| |n|)) (TIMES 4 |n|)) 2)) ('T - (PLUS (TIMES |mnp| (PLUS (TIMES 2 |n|) 1)) + (+ (TIMES |mnp| (+ (TIMES 2 |n|) 1)) |n|)))) (SPADLET |aerror| (|htpButtonValue| |htPage| '|afail|)) (SPADLET |afail| @@ -5297,7 +5297,7 @@ ((BOOT-EQUAL |cerror| '|cone|) '1) ('T '0))) (SPADLET |ifail| - (PLUS (PLUS (TIMES 100 |cfail|) + (+ (+ (TIMES 100 |cfail|) (TIMES 10 |bfail|)) |afail|)) (COND diff --git a/src/interp/nag-e01.lisp.pamphlet b/src/interp/nag-e01.lisp.pamphlet index c16e779..f42d0d4 100644 --- a/src/interp/nag-e01.lisp.pamphlet +++ b/src/interp/nag-e01.lisp.pamphlet @@ -311,8 +311,8 @@ (SPADLET |m| (|htpProperty| |htPage| '|m|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |lck| (PLUS |m| 4)) - (SPADLET |lwrk| (PLUS (TIMES 6 |m|) 16)) + (SPADLET |lck| (+ |m| 4)) + (SPADLET |lwrk| (+ (TIMES 6 |m|) 16)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN @@ -664,8 +664,8 @@ (SPADLET |n| (|htpProperty| |htPage| '|n|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |lck| (PLUS |n| 4)) - (SPADLET |lwrk| (PLUS (TIMES 6 |n|) 16)) + (SPADLET |lck| (+ |n| 4)) + (SPADLET |lwrk| (+ (TIMES 6 |n|) 16)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN @@ -1196,8 +1196,8 @@ (SPADLET |m| (|htpProperty| |htPage| '|m|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |lck| (PLUS |n| 4)) - (SPADLET |lwrk| (PLUS (TIMES 6 |n|) 16)) + (SPADLET |lck| (+ |n| 4)) + (SPADLET |lwrk| (+ (TIMES 6 |n|) 16)) (SPADLET |y| |alist|) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |m|) NIL) (SEQ (EXIT (PROGN @@ -1743,8 +1743,8 @@ (SPADLET |m| (|htpProperty| |htPage| '|m|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |lck| (PLUS |n| 4)) - (SPADLET |lwrk| (PLUS (TIMES 6 |n|) 16)) + (SPADLET |lck| (+ |n| 4)) + (SPADLET |lwrk| (+ (TIMES 6 |n|) 16)) (SPADLET |y| |alist|) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |m|) NIL) (SEQ (EXIT (PROGN @@ -2192,8 +2192,8 @@ (SPADLET |b| (|htpProperty| |htPage| '|b|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |lck| (PLUS |n| 4)) - (SPADLET |lwrk| (PLUS (TIMES 6 |n|) 16)) + (SPADLET |lck| (+ |n| 4)) + (SPADLET |lwrk| (+ (TIMES 6 |n|) 16)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN diff --git a/src/interp/nag-e02.lisp.pamphlet b/src/interp/nag-e02.lisp.pamphlet index 232b043..0de4860 100644 --- a/src/interp/nag-e02.lisp.pamphlet +++ b/src/interp/nag-e02.lisp.pamphlet @@ -484,7 +484,7 @@ (SPADLET |nrows| (|htpProperty| |htPage| '|nrows|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |kplus1| (PLUS |k| 1)) + (SPADLET |kplus1| (+ |k| 1)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN @@ -658,7 +658,7 @@ (PROG (G166160) (SPADLET G166160 NIL) (RETURN - (DO ((G166165 (PLUS |n| 1)) + (DO ((G166165 (+ |n| 1)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166165) G166160) (SEQ (EXIT @@ -777,7 +777,7 @@ (SPADLET |xcap| (|htpProperty| |htPage| '|xcap|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |nplus1| (PLUS |n| 1)) + (SPADLET |nplus1| (+ |n| 1)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN @@ -1560,7 +1560,7 @@ (SPADLET |lyf| (|htpProperty| |htPage| '|lyf|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |kplus1| (PLUS |k| 1)) + (SPADLET |kplus1| (+ |k| 1)) (SPADLET |ipsum| 0) (SPADLET |y| |alist|) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |lyf|) NIL) @@ -1576,7 +1576,7 @@ (SPADLET |iptestval| (READ-FROM-STRING |iptest|)) (SPADLET |ipsum| - (PLUS |ipsum| |iptestval|)) + (+ |ipsum| |iptestval|)) (SPADLET |ip| (STRCONC |iptest| '| |)) (SPADLET |iptestList| (CONS |iptestval| |iptestList|)) @@ -1584,7 +1584,7 @@ (SPADLET |y| (CDR |y|)))))) (SPADLET |ipstring| (|bcwords2liststring| |ipList|)) (SPADLET |ipmax| (APPLY 'MAX |iptestList|)) - (SPADLET |n| (PLUS |mf| |ipsum|)) + (SPADLET |n| (+ |mf| |ipsum|)) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |mf|) NIL) (SEQ (EXIT (PROGN (SPADLET |xf| @@ -1610,17 +1610,17 @@ (SPADLET |ystring| (|bcwords2liststring| |ylist|)) (SPADLET |wstring| (|bcwords2liststring| |wlist|)) (SPADLET |wrktest1| - (PLUS (TIMES 4 |m|) (TIMES 3 |kplus1|))) + (+ (TIMES 4 |m|) (TIMES 3 |kplus1|))) (SPADLET |wrktest2| - (PLUS (PLUS (PLUS (TIMES 8 |n|) + (+ (+ (+ (TIMES 8 |n|) (TIMES 5 |ipmax|)) |mf|) 10)) (SPADLET |wrktestlist| (CONS |wrktest1| (CONS |wrktest2| NIL))) (SPADLET |wrkmax| (APPLY 'MAX |wrktestlist|)) - (SPADLET |lwrk| (PLUS (PLUS |wrkmax| (TIMES 2 |n|)) 2)) - (SPADLET |liwrk| (PLUS (TIMES 2 |mf|) 2)) + (SPADLET |lwrk| (+ (+ |wrkmax| (TIMES 2 |n|)) 2)) + (SPADLET |liwrk| (+ (TIMES 2 |mf|) 2)) (SPADLET |prefix| (STRCONC "e02agf(" (STRINGIMAGE |m|) '|, | (STRINGIMAGE |kplus1|) '|, |)) @@ -1866,8 +1866,8 @@ ('T (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|ladifone|))))) - (SPADLET |la| (PLUS 1 (TIMES |n| |iaone|))) - (SPADLET |ladif| (PLUS 1 (TIMES |n| |ladifone|))) + (SPADLET |la| (+ 1 (TIMES |n| |iaone|))) + (SPADLET |ladif| (+ 1 (TIMES |n| |ladifone|))) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -2036,7 +2036,7 @@ (SPADLET |ladifone| (|htpProperty| |htPage| '|ladifone|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |np1| (PLUS |n| 1)) + (SPADLET |np1| (+ |n| 1)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN @@ -2297,8 +2297,8 @@ ('T (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|iaintone|))))) - (SPADLET |la| (PLUS 1 (TIMES |n| |iaone|))) - (SPADLET |laint| (PLUS (TIMES |n| |iaintone|) 1)) + (SPADLET |la| (+ 1 (TIMES |n| |iaone|))) + (SPADLET |laint| (+ (TIMES |n| |iaintone|) 1)) (SPADLET |qatmone| (|htpLabelInputString| |htPage| '|qatmone|)) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) @@ -2477,7 +2477,7 @@ (SPADLET |qatmone| (|htpProperty| |htPage| '|qatmone|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |np1| (PLUS |n| 1)) + (SPADLET |np1| (+ |n| 1)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN @@ -2702,7 +2702,7 @@ ('T (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|iaone|))))) - (SPADLET |la| (PLUS 1 (TIMES |n| |iaone|))) + (SPADLET |la| (+ 1 (TIMES |n| |iaone|))) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -2863,7 +2863,7 @@ (SPADLET |iaone| (|htpProperty| |htPage| '|iaone|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |np1| (PLUS |n| 1)) + (SPADLET |np1| (+ |n| 1)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN @@ -3124,7 +3124,7 @@ (PROG (G166710) (SPADLET G166710 NIL) (RETURN - (DO ((G166715 (PLUS |ncap| 3)) + (DO ((G166715 (+ |ncap| 3)) (|j| 5 (+ |j| 1))) ((> |j| G166715) G166710) (SEQ (EXIT @@ -3420,16 +3420,16 @@ (SPADLET |ncap| (|htpProperty| |htPage| '|ncap|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |ncap7| (PLUS |ncap| 7)) + (SPADLET |ncap7| (+ |ncap| 7)) (SPADLET |y| |alist|) - (DO ((G166753 (PLUS |ncap| 7)) - (|i| (PLUS |ncap| 4) (+ |i| 1))) + (DO ((G166753 (+ |ncap| 7)) + (|i| (+ |ncap| 4) (+ |i| 1))) ((> |i| G166753) NIL) (SEQ (EXIT (PROGN (SPADLET |lambda| (STRCONC '|0.0| '| |)) (SPADLET |lambdaList| (CONS |lambda| |lambdaList|)))))) - (DO ((G166763 (PLUS |ncap| 3)) (|i| 5 (+ |i| 1))) + (DO ((G166763 (+ |ncap| 3)) (|i| 5 (+ |i| 1))) ((> |i| G166763) NIL) (SEQ (EXIT (PROGN (SPADLET |lambda| @@ -3644,7 +3644,7 @@ (PROG (G166839) (SPADLET G166839 NIL) (RETURN - (DO ((G166844 (PLUS |ncap| 7)) + (DO ((G166844 (+ |ncap| 7)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166844) G166839) (SEQ (EXIT @@ -3825,7 +3825,7 @@ (SPADLET |x| (|htpProperty| |htPage| '|x|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |ncap7| (PLUS |ncap| 7)) + (SPADLET |ncap7| (+ |ncap| 7)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN @@ -4046,7 +4046,7 @@ (PROG (G166916) (SPADLET G166916 NIL) (RETURN - (DO ((G166921 (PLUS |ncap| 7)) + (DO ((G166921 (+ |ncap| 7)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166921) G166916) (SEQ (EXIT @@ -4252,7 +4252,7 @@ (SPADLET |deriv| (|htpProperty| |htPage| '|deriv|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |ncap7| (PLUS |ncap| 7)) + (SPADLET |ncap7| (+ |ncap| 7)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN @@ -4440,7 +4440,7 @@ (PROG (G166996) (SPADLET G166996 NIL) (RETURN - (DO ((G167001 (PLUS |ncap| 7)) + (DO ((G167001 (+ |ncap| 7)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167001) G166996) (SEQ (EXIT @@ -4639,7 +4639,7 @@ (SPADLET |ncap| (|htpProperty| |htPage| '|ncap|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) - (SPADLET |ncap7| (PLUS |ncap| 7)) + (SPADLET |ncap7| (+ |ncap| 7)) (SPADLET |y| |alist|) (DO () ((NULL |y|) NIL) (SEQ (EXIT (PROGN @@ -4833,7 +4833,7 @@ (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|nest|))))) (SPADLET |lwrk| - (PLUS (PLUS (TIMES 4 |m|) (TIMES 16 |nest|)) 41)) + (+ (+ (TIMES 4 |m|) (TIMES 16 |nest|)) 41)) (SPADLET |s| (|htpLabelInputString| |htPage| '|s|)) (SPADLET |initial| (|htpButtonValue| |htPage| '|start|)) (SPADLET |start| @@ -6235,16 +6235,16 @@ ('T (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|py|))))) - (SPADLET |nwrk1| (PLUS (TIMES 4 |mx|) |px|)) - (SPADLET |nwrk2| (PLUS (TIMES 4 |my|) |py|)) + (SPADLET |nwrk1| (+ (TIMES 4 |mx|) |px|)) + (SPADLET |nwrk2| (+ (TIMES 4 |my|) |py|)) (SPADLET |nwrklist| (CONS |nwrk1| (CONS |nwrk2| NIL))) (SPADLET |nwrkmin| (APPLY 'MIN |nwrklist|)) (SPADLET |lwrk| |nwrkmin|) (SPADLET |liwrk| (COND ((BOOT-EQUAL |nwrkmin| |nwrk2|) - (SPADDIFFERENCE (PLUS |my| |py|) 4)) - ('T (SPADDIFFERENCE (PLUS |mx| |px|) 4)))) + (SPADDIFFERENCE (+ |my| |py|) 4)) + ('T (SPADDIFFERENCE (+ |mx| |px|) 4)))) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -6854,7 +6854,7 @@ (PROG (G167566) (SPADLET G167566 NIL) (RETURN - (DO ((G167571 (PLUS |n| 2)) + (DO ((G167571 (+ |n| 2)) (|j| 1 (QSADD1 |j|))) ((QSGREATERP |j| G167571) G167566) (SEQ (EXIT (SETQ G167566 @@ -6899,7 +6899,7 @@ ('T (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|n|))))) - (SPADLET |la| (PLUS |m| 2)) + (SPADLET |la| (+ |m| 2)) (SPADLET |toler| (|htpLabelInputString| |htPage| '|toler|)) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) @@ -7129,7 +7129,7 @@ (SPADLET |la| (|htpProperty| |htPage| '|la|)) (SPADLET |toler| (|htpProperty| |htPage| '|toler|)) (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) - (SPADLET |nplustwo| (PLUS |n| 2)) + (SPADLET |nplustwo| (+ |n| 2)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) (SPADLET |y| |alist|) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |m|) NIL) @@ -7169,7 +7169,7 @@ (ELT (ELT |y| (SPADLET |k| - (PLUS |k| 1))) + (+ |k| 1))) 1) G167659))))))) G167646)))))))) @@ -7559,7 +7559,7 @@ (SPADDIFFERENCE |py| 4))) (SPADLET |nws| (SPADDIFFERENCE - (TIMES (PLUS (TIMES 2 |nc|) 1) + (TIMES (+ (TIMES 2 |nc|) 1) (SPADDIFFERENCE (TIMES 3 |py|) 6)) 2)) (SPADLET |eps| (|htpLabelInputString| |htPage| '|eps|)) @@ -8695,13 +8695,13 @@ (SPADLET |wrklist| (CONS |my| (CONS |nxest| NIL))) (SPADLET |wrkmax| (APPLY 'MAX |wrklist|)) (SPADLET |lwrk| - (PLUS (PLUS (PLUS (PLUS (TIMES 4 (PLUS |mx| |my|)) - (TIMES 11 (PLUS |nxest| |nyest|))) + (+ (+ (+ (+ (TIMES 4 (+ |mx| |my|)) + (TIMES 11 (+ |nxest| |nyest|))) (TIMES |nxest| |my|)) |wrkmax|) 54)) (SPADLET |liwrk| - (PLUS (PLUS (PLUS (PLUS 3 |mx|) |my|) |nxest|) + (+ (+ (+ (+ 3 |mx|) |my|) |nxest|) |nyest|)) (SPADLET |s| (|htpLabelInputString| |htPage| '|s|)) (SPADLET |initial| (|htpButtonValue| |htPage| '|start|)) @@ -9618,18 +9618,18 @@ (SPADLET |wlist| (CONS |u| (CONS |v| NIL))) (SPADLET |w| (APPLY 'MAX |wlist|)) (SPADLET |lwrk| - (PLUS (PLUS (PLUS (TIMES - (PLUS + (+ (+ (+ (TIMES + (+ (TIMES (TIMES 7 |u|) |v|) (TIMES 25 |w|)) - (PLUS |w| 1)) + (+ |w| 1)) (TIMES 2 - (PLUS (PLUS |u| |v|) + (+ (+ |u| |v|) (TIMES 4 |m|)))) (TIMES 23 |w|)) 56)) (SPADLET |liwrk| - (PLUS |m| + (+ |m| (TIMES (TIMES 2 (SPADDIFFERENCE |nxest| 7)) (SPADDIFFERENCE |nyest| 7)))) (SPADLET |s| (|htpLabelInputString| |htPage| '|s|)) diff --git a/src/interp/nag-e04.lisp.pamphlet b/src/interp/nag-e04.lisp.pamphlet index bf2a039..64373bb 100644 --- a/src/interp/nag-e04.lisp.pamphlet +++ b/src/interp/nag-e04.lisp.pamphlet @@ -2614,7 +2614,7 @@ (PROG (G166663) (SPADLET G166663 NIL) (RETURN - (DO ((G166668 (PLUS |n| |nclin|)) + (DO ((G166668 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166668) G166663) (SEQ (EXIT @@ -2632,7 +2632,7 @@ (PROG (G166672) (SPADLET G166672 NIL) (RETURN - (DO ((G166677 (PLUS |n| |nclin|)) + (DO ((G166677 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166677) G166672) (SEQ (EXIT @@ -3068,7 +3068,7 @@ (SPADLET |clist| (CONS |temp| |clist|)) (SPADLET |y| (CDR |y|)))))) (SPADLET |cstring| (|bcwords2liststring| |clist|)) - (DO ((G166775 (PLUS |n| |nclin|)) (|i| 1 (QSADD1 |i|))) + (DO ((G166775 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166775) NIL) (SEQ (EXIT (PROGN (SPADLET |temp| @@ -3076,7 +3076,7 @@ (SPADLET |bulist| (CONS |temp| |bulist|)) (SPADLET |y| (CDR |y|)))))) (SPADLET |bustring| (|bcwords2liststring| |bulist|)) - (DO ((G166785 (PLUS |n| |nclin|)) (|i| 1 (QSADD1 |i|))) + (DO ((G166785 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166785) NIL) (SEQ (EXIT (PROGN (SPADLET |temp| @@ -3117,7 +3117,7 @@ (SETQ G166814 (CONS (|bcwords2liststring| |x|) G166814))))))))) - (SPADLET |nctotl| (PLUS |n| |nclin|)) + (SPADLET |nctotl| (+ |n| |nclin|)) (SPADLET |prefix| (STRCONC '|e04mbf(| (STRINGIMAGE |itmax|) '|,| (STRINGIMAGE |msglvl|) '|, |)) @@ -3817,7 +3817,7 @@ (PROG (G166980) (SPADLET G166980 NIL) (RETURN - (DO ((G166985 (PLUS |n| |nclin|)) + (DO ((G166985 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166985) G166980) (SEQ (EXIT @@ -3835,7 +3835,7 @@ (PROG (G166989) (SPADLET G166989 NIL) (RETURN - (DO ((G166994 (PLUS |n| |nclin|)) + (DO ((G166994 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166994) G166989) (SEQ (EXIT @@ -3870,7 +3870,7 @@ (PROG (G167006) (SPADLET G167006 NIL) (RETURN - (DO ((G167011 (PLUS |n| |nclin|)) + (DO ((G167011 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167011) G167006) (SEQ (EXIT @@ -3922,7 +3922,7 @@ (PROG (G167031) (SPADLET G167031 NIL) (RETURN - (DO ((G167036 (PLUS |n| |nclin|)) + (DO ((G167036 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167036) G167031) (SEQ (EXIT @@ -4548,7 +4548,7 @@ (SPADLET |ifail| (|htpProperty| |htPage| '|ifail|)) (SPADLET |alist| (|htpInputAreaAlist| |htPage|)) (SPADLET |y| |alist|) - (DO ((G167128 (PLUS |n| |nclin|)) (|i| 1 (QSADD1 |i|))) + (DO ((G167128 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167128) NIL) (SEQ (EXIT (PROGN (SPADLET |temp| @@ -4596,7 +4596,7 @@ (SETQ G167166 (CONS (|bcwords2liststring| |x|) G167166))))))))) - (DO ((G167183 (PLUS |n| |nclin|)) (|i| 1 (QSADD1 |i|))) + (DO ((G167183 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167183) NIL) (SEQ (EXIT (PROGN (SPADLET |temp| @@ -4611,7 +4611,7 @@ (SPADLET |clist| (CONS |temp| |clist|)) (SPADLET |y| (CDR |y|)))))) (SPADLET |cstring| (|bcwords2liststring| |clist|)) - (DO ((G167202 (PLUS |n| |nclin|)) (|i| 1 (QSADD1 |i|))) + (DO ((G167202 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167202) NIL) (SEQ (EXIT (PROGN (SPADLET |temp| @@ -4619,7 +4619,7 @@ (SPADLET |bulist| (CONS |temp| |bulist|)) (SPADLET |y| (CDR |y|)))))) (SPADLET |bustring| (|bcwords2liststring| |bulist|)) - (DO ((G167212 (PLUS |n| |nclin|)) (|i| 1 (QSADD1 |i|))) + (DO ((G167212 (+ |n| |nclin|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167212) NIL) (SEQ (EXIT (PROGN (SPADLET |temp| @@ -4660,7 +4660,7 @@ (SETQ G167241 (CONS (|bcwords2liststring| |x|) G167241))))))))) - (SPADLET |nctotl| (PLUS |n| |nclin|)) + (SPADLET |nctotl| (+ |n| |nclin|)) (SPADLET |prefix| (STRCONC '|e04naf(| (STRINGIMAGE |itmax|) '|,| (STRINGIMAGE |msglvl|) '|, |)) @@ -5209,7 +5209,7 @@ (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|nrowr|))))) (SPADLET |liwork| - (PLUS (PLUS (TIMES 3 |n|) |nclin|) + (+ (+ (TIMES 3 |n|) |nclin|) (TIMES 2 |ncnln|))) (SPADLET |lwork| (COND @@ -5217,13 +5217,13 @@ (BOOT-EQUAL |nclin| '0)) (TIMES 20 |n|)) ((AND (BOOT-EQUAL |ncnln| '0) (> |nclin| '0)) - (PLUS (PLUS (TIMES (TIMES 2 |n|) |n|) + (+ (+ (TIMES (TIMES 2 |n|) |n|) (TIMES 20 |n|)) (TIMES 11 |nclin|))) ((AND (> |ncnln| '0) (>= |nclin| '0)) - (PLUS (PLUS (PLUS - (PLUS - (PLUS (TIMES (TIMES 2 |n|) |n|) + (+ (+ (+ + (+ + (+ (TIMES (TIMES 2 |n|) |n|) (TIMES |n| |nclin|)) (TIMES (TIMES 2 |n|) |ncnln|)) (TIMES 20 |n|)) @@ -5269,7 +5269,7 @@ (SPADLET G167395 NIL) (RETURN (DO ((G167400 - (PLUS (PLUS |n| |nclin|) |ncnln|)) + (+ (+ |n| |nclin|) |ncnln|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167400) G167395) (SEQ (EXIT @@ -5288,7 +5288,7 @@ (SPADLET G167404 NIL) (RETURN (DO ((G167409 - (PLUS (PLUS |n| |nclin|) |ncnln|)) + (+ (+ |n| |nclin|) |ncnln|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167409) G167404) (SEQ (EXIT @@ -5990,7 +5990,7 @@ (CONS |temp| |cxlist|)) (SPADLET |y| (CDR |y|)))))) (SPADLET |cxstring| (|bcwords2liststring| |cxlist|)) - (DO ((G167526 (PLUS (PLUS |n| |nclin|) |ncnln|)) + (DO ((G167526 (+ (+ |n| |nclin|) |ncnln|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167526) NIL) (SEQ (EXIT (PROGN @@ -6001,7 +6001,7 @@ (CONS |temp| |bulist|)) (SPADLET |y| (CDR |y|)))))) (SPADLET |buu| (|bcwords2liststring| |bulist|)) - (DO ((G167536 (PLUS (PLUS |n| |nclin|) |ncnln|)) + (DO ((G167536 (+ (+ |n| |nclin|) |ncnln|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167536) NIL) (SEQ (EXIT (PROGN @@ -6125,7 +6125,7 @@ (CONS |temp| |cxlist|)) (SPADLET |y| (CDR |y|)))))) (SPADLET |cxstring| (|bcwords2liststring| |cxlist|)) - (DO ((G167600 (PLUS (PLUS |n| |nclin|) |ncnln|)) + (DO ((G167600 (+ (+ |n| |nclin|) |ncnln|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167600) NIL) (SEQ (EXIT (PROGN @@ -6136,7 +6136,7 @@ (CONS |temp| |bulist|)) (SPADLET |y| (CDR |y|)))))) (SPADLET |buu| (|bcwords2liststring| |bulist|)) - (DO ((G167610 (PLUS (PLUS |n| |nclin|) |ncnln|)) + (DO ((G167610 (+ (+ |n| |nclin|) |ncnln|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167610) NIL) (SEQ (EXIT (PROGN @@ -6183,7 +6183,7 @@ (SETQ G167639 (CONS (|bcwords2liststring| |x|) G167639))))))))))) - (SPADLET |ntotl| (PLUS (PLUS |n| |nclin|) |ncnln|)) + (SPADLET |ntotl| (+ (+ |n| |nclin|) |ncnln|)) (SPADLET |prefix| (STRCONC '|e04ucf(| (STRINGIMAGE |n|) '|, | (STRINGIMAGE |nclin|) '|, |)) diff --git a/src/interp/nag-f01.lisp.pamphlet b/src/interp/nag-f01.lisp.pamphlet index 034debb..3d24e24 100644 --- a/src/interp/nag-f01.lisp.pamphlet +++ b/src/interp/nag-f01.lisp.pamphlet @@ -345,7 +345,7 @@ ((BOOT-EQUAL |cerror| '|cone|) '1) ('T '0))) (SPADLET |ifail| - (PLUS (PLUS (TIMES 100 |cfail|) + (+ (+ (TIMES 100 |cfail|) (TIMES 10 |bfail|)) |afail|)) (COND @@ -1109,7 +1109,7 @@ ((BOOT-EQUAL |cerror| '|cone|) '1) ('T '0))) (SPADLET |ifail| - (PLUS (PLUS (TIMES 100 |cfail|) + (+ (+ (TIMES 100 |cfail|) (TIMES 10 |bfail|)) |afail|)) (SPADLET |droptl| diff --git a/src/interp/nag-f04.lisp.pamphlet b/src/interp/nag-f04.lisp.pamphlet index 57e3f28..ebe8afd 100644 --- a/src/interp/nag-f04.lisp.pamphlet +++ b/src/interp/nag-f04.lisp.pamphlet @@ -546,7 +546,7 @@ (ELT (ELT |y| (setq |k| - (PLUS |k| 1))) + (+ |k| 1))) 1) G166355))))))) G166342)))))))) @@ -995,7 +995,7 @@ (ELT (ELT |y| (setq |k| - (PLUS |k| 1))) + (+ |k| 1))) 1) G166504))))))) G166491)))))))) @@ -1443,7 +1443,7 @@ (ELT (ELT |y| (setq |k| - (PLUS |k| 1))) + (+ |k| 1))) 1) G166654))))))) G166641)))))))) diff --git a/src/interp/newfort.lisp.pamphlet b/src/interp/newfort.lisp.pamphlet index f3f4ce0..53f681b 100644 --- a/src/interp/newfort.lisp.pamphlet +++ b/src/interp/newfort.lisp.pamphlet @@ -130,7 +130,7 @@ (RETURN (PROGN (SPADLET |$exp2FortTempVarIndex| - (PLUS 1 |$exp2FortTempVarIndex|)) + (+ 1 |$exp2FortTempVarIndex|)) (SPADLET |newVar| (INTERN (STRCONC "T" (STRINGIMAGE |$exp2FortTempVarIndex|)))) @@ -541,7 +541,7 @@ (declare (special |$fortCsList|)) (RETURN (PROGN - (SETELT |n| 0 (PLUS (ELT |n| 0) 1)) + (SETELT |n| 0 (+ (ELT |n| 0) 1)) (COND ((EQL (ELT |n| 0) 2) (SPADLET |var| (SETELT |n| 1 (|newFortranTempVar|))) @@ -838,10 +838,10 @@ (SEQ (EXIT (COND ((<= - (PLUS |ll| + (+ |ll| (SPADLET |sff| (SIZE |ff|))) |$fortLength|) - (SPADLET |ll| (PLUS |ll| |sff|)) + (SPADLET |ll| (+ |ll| |sff|)) (SPADLET |line| (STRCONC |line| |ff|)) (SPADLET |f| (CDR |f|)) @@ -851,7 +851,7 @@ ('T (COND ((AND (> |$fortLength| |ll|) - (> (PLUS |ll| |sff|) + (> (+ |ll| |sff|) |$fortLength|)) (SPADLET |spaceLeft| (SPADDIFFERENCE @@ -1240,7 +1240,7 @@ (SPADLET |var| (|object2String| |var|)) (SPADLET |si| |$fortranArrayStartingIndex|) (SPADLET |hidim| - (PLUS (SPADDIFFERENCE (|#| |elts|) 1) |si|)) + (+ (SPADDIFFERENCE (|#| |elts|) 1) |si|)) (SEQ (COND ((AND (LISTP (CAR |elts|)) (EQL (|#| |elts|) 1) (PROGN @@ -1570,7 +1570,7 @@ (SPADLET |$maximumFortranExpressionLength| (SPADDIFFERENCE |$maximumFortranExpressionLength| (TIMES 2 |i|))) - (SPADLET |$fortIndent| (PLUS |$fortIndent| (TIMES 2 |i|))))) + (SPADLET |$fortIndent| (+ |$fortIndent| (TIMES 2 |i|))))) ;changeExprLength(i) ==> ; $maximumFortranExpressionLength := $maximumFortranExpressionLength + i @@ -1580,7 +1580,7 @@ (DSETQ (NIL G166767) G166771) (SUBLISLIS (LIST G166767) '(G166767) '(SPADLET |$maximumFortranExpressionLength| - (PLUS |$maximumFortranExpressionLength| G166767)))) + (+ |$maximumFortranExpressionLength| G166767)))) ;fortFormatDo(var,lo,hi,incr,lab) == ; $fortError : fluid := nil @@ -1932,8 +1932,8 @@ (DEFMACRO |nameLen| (&WHOLE G166941 &REST G166942 &AUX G166937) (DSETQ (NIL G166937) G166941) (SUBLISLIS (LIST G166937) '(G166937) - '(SPADREDUCE PLUS 0 - (COLLECT (IN |u| G166937) (PLUS 1 (LENGTH |u|)))))) + '(SPADREDUCE + 0 + (COLLECT (IN |u| G166937) (+ 1 (LENGTH |u|)))))) ;fortFormatTypes(typeName,names) == ; null names => return() @@ -2010,8 +2010,8 @@ (DO () ((NULL (> |l| (SPADLET |ln| - (PLUS - (PLUS |ln| + (+ + (+ |ln| (LENGTH (CAR |names|))) 1)))) NIL) @@ -2597,20 +2597,20 @@ ((BOOT-EQUAL |$fortranPrecision| '|double|) (SPADLET |iPart| (SUBSEQ |e| 0 - (PLUS (SPADLET |period| + (+ (SPADLET |period| (POSITION (|char| (INTERN "." "BOOT")) |e|)) 1))) (SPADLET |expt| (COND ((SPADLET |ePos| (POSITION (|char| 'E) |e|)) - (SUBSEQ |e| (PLUS |ePos| 1))) + (SUBSEQ |e| (+ |ePos| 1))) ('T '|0|))) (SPADLET |rPart| (COND - (|ePos| (SUBSEQ |e| (PLUS |period| 1) |ePos|)) - ((> (LENGTH |e|) (PLUS |period| 1)) - (SUBSEQ |e| (PLUS |period| 1))) + (|ePos| (SUBSEQ |e| (+ |period| 1) |ePos|)) + ((> (LENGTH |e|) (+ |period| 1)) + (SUBSEQ |e| (+ |period| 1))) ('T '|0|))) (STRCONC |iPart| |rPart| 'D |expt|)) ('T |e|))))))) @@ -2647,14 +2647,14 @@ (COND ((ATOM |e|) (LENGTH (STRINGIMAGE |e|))) ((> (|#| |e|) 3) - (PLUS 2 (|fortSize| (MAPCAR #'|fortExpSize| |e|)))) + (+ 2 (|fortSize| (MAPCAR #'|fortExpSize| |e|)))) ((QSLESSP (|#| |e|) 3) - (PLUS 2 (|fortSize| (MAPCAR #'|fortExpSize| |e|)))) + (+ 2 (|fortSize| (MAPCAR #'|fortExpSize| |e|)))) ('T (SPADLET |op| (CAR |e|)) (SPADLET |arg1| (CADR |e|)) (SPADLET |arg2| (CADDR |e|)) (SPADLET |op| (STRINGIMAGE |op|)) (COND ((BOOT-EQUAL |op| "CMPLX") - (PLUS 3 + (+ 3 (|fortSize| (CONS (|fortExpSize| |arg1|) (CONS (|fortExpSize| |arg2|) NIL))))) @@ -2668,22 +2668,22 @@ ((AND (LISTP |arg1|) (NULL (BOOT-EQUAL |op| (STRINGIMAGE (CAR |arg1|))))) - (PLUS 2 + (+ 2 (|fortSize| (MAPCAR #'|fortExpSize| |e|)))) ((AND (LISTP |arg2|) (NULL (BOOT-EQUAL |op| (STRINGIMAGE (CAR |arg2|))))) - (PLUS 2 + (+ 2 (|fortSize| (MAPCAR #'|fortExpSize| |e|)))) ('T - (PLUS 1 + (+ 1 (|fortSize| (CONS (|fortExpSize| |arg1|) (CONS (|fortExpSize| |arg2|) NIL))))))) ('T - (PLUS 2 + (+ 2 (|fortSize| (MAPCAR #'|fortExpSize| |e|)))))))))))) @@ -2707,14 +2707,14 @@ (PROGN (SETQ |u| (CAR G167305)) NIL)) G167300) (SEQ (EXIT (SETQ G167300 - (PLUS G167300 + (+ G167300 (|fortSize,elen| |u|)))))))))))) ;tempLen () == 1 + LENGTH STRINGIMAGE $exp2FortTempVarIndex (DEFUN |tempLen| () (declare (special |$exp2FortTempVarIndex|)) - (PLUS 1 (LENGTH (STRINGIMAGE |$exp2FortTempVarIndex|)))) + (+ 1 (LENGTH (STRINGIMAGE |$exp2FortTempVarIndex|)))) ;segment l == ; not $fortranSegment => l @@ -2817,7 +2817,7 @@ (SPADDIFFERENCE (SPADDIFFERENCE |maxSize| (TIMES (SPADDIFFERENCE (|#| |e|) 1) - (PLUS (|tempLen|) 1))) + (+ (|tempLen|) 1))) (|fortExpSize| |newE|))) (DO ((G167348 (|#| |e|)) (|i| 2 (QSADD1 |i|))) ((QSGREATERP |i| G167348) NIL) diff --git a/src/interp/nruncomp.lisp.pamphlet b/src/interp/nruncomp.lisp.pamphlet index 8938c1a..e209f67 100644 --- a/src/interp/nruncomp.lisp.pamphlet +++ b/src/interp/nruncomp.lisp.pamphlet @@ -608,7 +608,7 @@ (SPADLET |$NRTdeltaListComp| (CONS NIL |$NRTdeltaListComp|))) (SPADLET |$NRTdeltaLength| - (PLUS |$NRTdeltaLength| 1)) + (+ |$NRTdeltaLength| 1)) (SPADLET |compEntry| (CAR (|compOrCroak| |odc| |$EmptyMode| |$e|))) @@ -618,13 +618,13 @@ (CONS '$ (CONS (SPADDIFFERENCE - (PLUS |$NRTbase| + (+ |$NRTbase| |$NRTdeltaLength|) (COND ((SPADLET |n| (POSN1 |opModemapPair| |$NRTdeltaList|)) - (PLUS |n| 1)) + (+ |n| 1)) ('T (SPADLET |$NRTdeltaList| (CONS |opModemapPair| @@ -634,7 +634,7 @@ (CONS NIL |$NRTdeltaListComp|)) (SPADLET |$NRTdeltaLength| - (PLUS |$NRTdeltaLength| + (+ |$NRTdeltaLength| 1)) 0))) NIL)))) @@ -744,7 +744,7 @@ (CONS |opModemapPair| |$NRTdeltaList|)) (SPADLET |$NRTdeltaListComp| (CONS NIL |$NRTdeltaListComp|)) - (SPADLET |$NRTdeltaLength| (PLUS |$NRTdeltaLength| 1))))))))) + (SPADLET |$NRTdeltaLength| (+ |$NRTdeltaLength| 1))))))))) ;NRTisExported? opSig == ; or/[u for u in $domainShell.1 | u.0 = opSig] @@ -1218,14 +1218,14 @@ (SPADLET |makeCatvecCode| (CAR |catvecListMaker|)) (SPADLET |emptyVector| (VECTOR)) (SPADLET |domainShell| - (make-array (PLUS 6 |$NRTdeltaLength|))) + (make-array (+ 6 |$NRTdeltaLength|))) (DO ((|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| 4) NIL) (SEQ (EXIT (SETELT |domainShell| |i| (ELT |$domainShell| |i|))))) (SPADLET |$template| (COND ((BOOT-EQUAL |$NRTvec| 'T) - (make-array (PLUS 6 |$NRTdeltaLength|))) + (make-array (+ 6 |$NRTdeltaLength|))) ('T NIL))) (SPADLET |$catvecList| (CONS |domainShell| @@ -1404,7 +1404,7 @@ (CONS '$ (CONS (CONS 'make-array (CONS - (PLUS 6 |$NRTdeltaLength|) + (+ 6 |$NRTdeltaLength|) NIL)) NIL)))) (SPADLET |setVector0Code| @@ -1528,7 +1528,7 @@ (DEFUN |NRTvectorCopy| (|cacheName| |domName| |deltaLength|) (declare (ignore |cacheName| |domName| )) - (make-array (PLUS 6 |deltaLength|))) + (make-array (+ 6 |deltaLength|))) ;mkDomainCatName id == INTERN STRCONC(id,";CAT") @@ -2487,7 +2487,7 @@ (SETQ G167647 (OR G167647 |i|)))))))))) (COND - (|u| (PLUS (SPADDIFFERENCE |$NRTdeltaLength| |u|) 6)) + (|u| (+ (SPADDIFFERENCE |$NRTdeltaLength| |u|) 6)) ('T NIL))))))) ;NRTsubstDelta(initSig) == @@ -2517,7 +2517,7 @@ (SPADLET |u| (ELT |$NRTdeltaList| (SPADDIFFERENCE - (PLUS |$NRTdeltaLength| 5) |t|))) + (+ |$NRTdeltaLength| 5) |t|))) (IF (BOOT-EQUAL (CAR |u|) '|domain|) (EXIT (CADR |u|))) (EXIT (|error| '|bad $NRTdeltaList entry|))))) diff --git a/src/interp/nrunfast.lisp.pamphlet b/src/interp/nrunfast.lisp.pamphlet index 2a3e72c..dcb0231 100644 --- a/src/interp/nrunfast.lisp.pamphlet +++ b/src/interp/nrunfast.lisp.pamphlet @@ -423,7 +423,7 @@ (SPADLET |start| (QSPLUS |start| (QSPLUS |numTableArgs| 4))) - (SPADLET |i| (PLUS |start| 2)) + (SPADLET |i| (+ |start| 2)) (SPADLET |someMatch| 'T) (SPADLET |subsumptionSig| (PROG (G166200) @@ -713,7 +713,7 @@ (CONS (|newExpandTypeSlot| (ELT |numvec| - (PLUS (PLUS |i| |j|) + (+ (+ |i| |j|) 1)) |dollar| |domain|) G166290)))))))) @@ -726,8 +726,8 @@ ('T (SPADLET |loc| (ELT |numvec| - (PLUS - (PLUS |i| |numTableArgs|) 2))) + (+ + (+ |i| |numTableArgs|) 2))) (COND ((EQL |loc| 1) (SPADLET |someMatch| 'T)) @@ -736,7 +736,7 @@ (QSPLUS |start| (QSPLUS |numTableArgs| 4))) (SPADLET |i| - (PLUS |start| 2)) + (+ |start| 2)) (SPADLET |someMatch| 'T) (SPADLET |subsumptionSig| (PROG (G166302) @@ -936,7 +936,7 @@ (SEQ (EXIT (SETQ G166368 - (CONS (ELT |dom| (PLUS 5 |i|)) + (CONS (ELT |dom| (+ 5 |i|)) G166368))))))))) (SPADLET |valueList| (PROG (G166381) @@ -1008,14 +1008,14 @@ (SPADLET |endPos| (COND ((> - (PLUS |code| + (+ |code| 2) |max|) (SIZE |byteVector|)) ('T (ELT |opvec| - (PLUS |code| + (+ |code| 2))))) (SPADLET |packageForm| @@ -1325,7 +1325,7 @@ (SEQ (EXIT (SETQ G166497 - (CONS (ELT |dom| (PLUS 5 |i|)) + (CONS (ELT |dom| (+ 5 |i|)) G166497))))))))) (SPADLET |valueList| (PROG (G166510) @@ -1393,14 +1393,14 @@ (SPADLET |endPos| (COND ((> - (PLUS |code| + (+ |code| 2) |max|) (SIZE |byteVector|)) ('T (ELT |opvec| - (PLUS |code| + (+ |code| 2))))) (COND ((NULL @@ -1490,7 +1490,7 @@ (SPADLET |args| (ELT |bytevec| |start|)) (COND ((BOOT-EQUAL |num| |args|) 'T) - ((BOOT-EQUAL (SPADLET |start| (PLUS (PLUS |start| |args|) 4)) + ((BOOT-EQUAL (SPADLET |start| (+ (+ |start| |args|) 4)) |finish|) NIL) ('T (|nrunNumArgCheck| |num| |bytevec| |start| |finish|))))))) @@ -1597,7 +1597,7 @@ (NREVERSE0 G166586)) (SEQ (EXIT (SETQ G166586 - (CONS (ELT |dom| (PLUS 5 |i|)) + (CONS (ELT |dom| (+ 5 |i|)) G166586))))))))) (SPADLET |valueList| (PROG (G166599) @@ -1902,7 +1902,7 @@ (RETURN (DO ((G166713 NIL (NULL G166706)) (G166714 (CDR |sig|) (CDR G166714)) - (|s| NIL) (|i| (PLUS |index| 1) (+ |i| 1))) + (|s| NIL) (|i| (+ |index| 1) (+ |i| 1))) ((OR G166713 (ATOM G166714) (PROGN (SETQ |s| (CAR G166714)) NIL)) G166706) @@ -2345,7 +2345,7 @@ ('T (SPADLET |slotIndex| (ELT |numvec| - (PLUS (PLUS |i| 2) + (+ (+ |i| 2) |numberOfArgs|))) (SPADLET |newStart| (QSPLUS |start| diff --git a/src/interp/nrungo.lisp.pamphlet b/src/interp/nrungo.lisp.pamphlet index 10849b2..1400199 100644 --- a/src/interp/nrungo.lisp.pamphlet +++ b/src/interp/nrungo.lisp.pamphlet @@ -365,7 +365,7 @@ (NREVERSE0 G166273)) (SEQ (EXIT (SETQ G166273 - (CONS (ELT |dom| (PLUS 5 |i|)) + (CONS (ELT |dom| (+ 5 |i|)) G166273))))))))) (SPADLET |valueList| (PROG (G166286) @@ -1158,7 +1158,7 @@ (DO ((G167128 NIL (NULL G167121)) (G167129 (SPADDIFFERENCE - (PLUS |minIndex| |n|) 1)) + (+ |minIndex| |n|) 1)) (|i| |minIndex| (+ |i| 1)) (G167130 |specialValues| (CDR G167130)) @@ -1199,7 +1199,7 @@ NIL)) (RETURN NIL)) ('T (SPADLET |k| (|#| |specialValues|)) - (SPADLET |n| (PLUS |k| |minIndex|)) + (SPADLET |n| (+ |k| |minIndex|)) (SPADLET |predOk| (COND ((EQUAL |generalPred| ''T) 'T) @@ -1250,7 +1250,7 @@ 'T))))))))))))) (EQ |lesspSlot| (ELT |$minivector| |slot|))) - (PLUS |m| 1)) + (+ |m| 1)) ((AND (CONSP |generalPred|) (EQ (QCAR |generalPred|) 'SPADCALL) (PROGN diff --git a/src/interp/nrunopt.lisp.pamphlet b/src/interp/nrunopt.lisp.pamphlet index 7eaf7f4..8b7f0c2 100644 --- a/src/interp/nrunopt.lisp.pamphlet +++ b/src/interp/nrunopt.lisp.pamphlet @@ -115,7 +115,7 @@ (CONS |index| NIL))))) (SPADLET |$byteVec| (CONS |newcode| |$byteVec|)) (SPADLET |curAddress| |$byteAddress|) - (SPADLET |$byteAddress| (PLUS (PLUS |$byteAddress| |n|) 4)) + (SPADLET |$byteAddress| (+ (+ |$byteAddress| |n|) 4)) (CONS |curAddress| |op|))))) ;--======================================================================= @@ -247,7 +247,7 @@ (IF (BOOT-EQUAL |r| (CONS '|Subsumed| NIL)) (EXIT (SEQ (SPADLET |n| (SPADDIFFERENCE (|#| |sig|) 1)) (SPADLET |$byteAddress| - (PLUS (PLUS |$byteAddress| |n|) 4)) + (+ (+ |$byteAddress| |n|) 4)) (EXIT (CONS |n| (CONS 0 (APPEND @@ -286,7 +286,7 @@ (EXIT (SPADLET |slot| 1))) NIL) (SPADLET |n| (SPADDIFFERENCE (|#| |sig|) 1)) - (SPADLET |$byteAddress| (PLUS (PLUS |$byteAddress| |n|) 4)) + (SPADLET |$byteAddress| (+ (+ |$byteAddress| |n|) 4)) (SPADLET |res| (CONS |n| (CONS |predCode| @@ -502,7 +502,7 @@ ((ELT |template| 5) (|stuffSlot| |dollar| 5 (ELT |template| 5)))) (DO ((G166368 (MAXINDEX |template|)) - (|i| (PLUS 6 (|#| (CDR |domname|))) (+ |i| 1))) + (|i| (+ 6 (|#| (CDR |domname|))) (+ |i| 1))) ((> |i| G166368) NIL) (SEQ (EXIT (COND ((SPADLET |item| (ELT |template| |i|)) @@ -808,7 +808,7 @@ (IF (BOOT-EQUAL |u| 'T) (EXIT 0)) (IF (NULL |u|) (EXIT (SPADDIFFERENCE 1))) (IF (SPADLET |p| (POSN1 |u| |$NRTslot1PredicateList|)) - (EXIT (PLUS |p| 1))) + (EXIT (+ |p| 1))) (IF (NULL |flag|) (EXIT (|predicateBitIndex,pn| (|predicateBitIndexRemop| |x|) 'T))) @@ -1025,7 +1025,7 @@ ; QSETREFV(dollar,3,value + QVELT(dollar,3)) (DEFUN |augmentPredVector| (|dollar| |value|) - (QSETREFV |dollar| 3 (PLUS |value| (QVELT |dollar| 3)))) + (QSETREFV |dollar| 3 (+ |value| (QVELT |dollar| 3)))) ;isHasDollarPred pred == ; pred is [op,:r] => @@ -1234,7 +1234,7 @@ (SEQ (EXIT (SETQ G166921 (CONS (|mungeAddGensyms,fn| |y| - |gal| (PLUS |n| 1)) + |gal| (+ |n| 1)) G166921))))))))))))) @@ -1306,8 +1306,8 @@ ; fn(rest l,n) (DEFUN |buildBitTable,fn| (|l| |n|) - (SEQ (IF (NULL |l|) (EXIT |n|)) (SPADLET |n| (PLUS |n| |n|)) - (IF (QCAR |l|) (SPADLET |n| (PLUS |n| 1)) NIL) + (SEQ (IF (NULL |l|) (EXIT |n|)) (SPADLET |n| (+ |n| |n|)) + (IF (QCAR |l|) (SPADLET |n| (+ |n| 1)) NIL) (EXIT (|buildBitTable,fn| (CDR |l|) |n|)))) (DEFUN |buildBitTable| (&REST G166988 &AUX |l|) @@ -1321,8 +1321,8 @@ (DEFUN |buildPredVector,fn| (|acc| |n| |l|) (SEQ (IF (NULL |l|) (EXIT |acc|)) - (IF (CAR |l|) (SPADLET |acc| (PLUS |acc| |n|)) NIL) - (EXIT (|buildPredVector,fn| |acc| (PLUS |n| |n|) (CDR |l|))))) + (IF (CAR |l|) (SPADLET |acc| (+ |acc| |n|)) NIL) + (EXIT (|buildPredVector,fn| |acc| (+ |n| |n|) (CDR |l|))))) (DEFUN |buildPredVector| (|init| |n| |l|) (|buildPredVector,fn| |init| (EXPT 2 |n|) |l|)) @@ -1340,7 +1340,7 @@ ; 1 + bitsOf (n/2) (DEFUN |bitsOf| (|n|) - (COND ((EQL |n| 0) 0) ('T (PLUS 1 (|bitsOf| (QUOTIENT |n| 2)))))) + (COND ((EQL |n| 0) 0) ('T (+ 1 (|bitsOf| (QUOTIENT |n| 2)))))) ;--======================================================================= ;-- Generate Slot 4 Constructor Vectors @@ -1434,7 +1434,7 @@ NIL)) (NREVERSE0 G167056)) (SEQ (EXIT (SETQ G167056 - (CONS (CONS (PLUS 5 |i|) |b|) + (CONS (CONS (+ 5 |i|) |b|) G167056)))))))) (SPADLET |slot1| (PROG (G167076) @@ -1494,7 +1494,7 @@ ((QSGREATERP |i| G167117) (NREVERSE0 G167112)) (SEQ (EXIT (SETQ G167112 - (CONS (PLUS 5 |i|) G167112)))))))) + (CONS (+ 5 |i|) G167112)))))))) (SPADLET |formals| (ASSOCRIGHT |$pairlis|)) (DO ((G167124 |slot1| (CDR G167124)) (|x| NIL)) ((OR (ATOM G167124) @@ -1675,7 +1675,7 @@ (SPADLET |v| (|depthAssocList| |u|)) (HPUT |$depthAssocCache| |x| (CONS (CONS |x| - (PLUS 1 + (+ 1 (PROG (G167268) (SPADLET G167268 -999999) (RETURN @@ -2156,10 +2156,10 @@ (SPADLET |numvec| (|getCodeVector|)) (SPADLET |numOfArgs| (ELT |numvec| |index|)) (SPADLET |whereNumber| - (ELT |numvec| (SPADLET |index| (PLUS |index| 1)))) + (ELT |numvec| (SPADLET |index| (+ |index| 1)))) (SPADLET |signumList| - (|dcSig| |numvec| (PLUS |index| 1) |numOfArgs|)) - (SPADLET |index| (PLUS (PLUS |index| |numOfArgs|) 1)) + (|dcSig| |numvec| (+ |index| 1) |numOfArgs|)) + (SPADLET |index| (+ (+ |index| |numOfArgs|) 1)) (SPADLET |namePart| (|concat| (|bright| '|from|) (|dollarPercentTran| @@ -2204,7 +2204,7 @@ (PROG (G167756) (SPADLET G167756 NIL) (RETURN - (DO ((G167761 (PLUS (PLUS |index| |numOfArgs|) 3)) + (DO ((G167761 (+ (+ |index| |numOfArgs|) 3)) (|i| |index| (+ |i| 1))) ((> |i| G167761) (NREVERSE0 G167756)) (SEQ (EXIT (SETQ G167756 @@ -2310,15 +2310,15 @@ ((QSGREATERP |i| G167818) NIL) (SEQ (EXIT (PROGN (SPADLET |op| (ELT |opTable| |i|)) - (SPADLET |i| (PLUS |i| 1)) + (SPADLET |i| (+ |i| 1)) (SPADLET |startIndex| (ELT |opTable| |i|)) (SPADLET |stopIndex| (COND - ((> (PLUS |i| 1) + ((> (+ |i| 1) (MAXINDEX |opTable|)) (MAXINDEX (|getCodeVector|))) ('T - (ELT |opTable| (PLUS |i| 2))))) + (ELT |opTable| (+ |i| 2))))) (SPADLET |curIndex| |startIndex|) (DO () ((NULL (> |stopIndex| |curIndex|)) NIL) @@ -2357,11 +2357,11 @@ (SPADLET |numvec| (|getCodeVector|)) (SPADLET |segment| (|getOpSegment| |index|)) (SPADLET |numOfArgs| (ELT |numvec| |index|)) - (SPADLET |index| (PLUS |index| 1)) + (SPADLET |index| (+ |index| 1)) (SPADLET |predNumber| (ELT |numvec| |index|)) - (SPADLET |index| (PLUS |index| 1)) + (SPADLET |index| (+ |index| 1)) (SPADLET |signumList| (|dcSig| |numvec| |index| |numOfArgs|)) - (SPADLET |index| (PLUS (PLUS |index| |numOfArgs|) 1)) + (SPADLET |index| (+ (+ |index| |numOfArgs|) 1)) (SPADLET |slotNumber| (ELT |numvec| |index|)) (SPADLET |suffix| (COND @@ -2386,7 +2386,7 @@ (|sayBrightly| (APPEND (|formatOpSignature| |op| |signumList|) (APPEND |namePart| |suffix|))) - (PLUS |index| 1))))) + (+ |index| 1))))) ;dcSig(numvec,index,numOfArgs) == ; [formatSlotDomain numvec.(index + i) for i in 0..numOfArgs] @@ -2402,7 +2402,7 @@ (SEQ (EXIT (SETQ G167868 (CONS (|formatSlotDomain| (ELT |numvec| - (PLUS |index| |i|))) + (+ |index| |i|))) G167868))))))))))) ;dcPreds con == @@ -2425,7 +2425,7 @@ (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G167887) NIL) (SEQ (EXIT (PROGN - (|sayBrightlyNT| (|bright| (PLUS |i| 1))) + (|sayBrightlyNT| (|bright| (+ |i| 1))) (|sayBrightly| (|pred2English| (ELT |$predvec| |i|)))))))))))) @@ -2663,7 +2663,7 @@ (|rightJustifyString| (STRINGIMAGE |start|) 6)) (|sayBrightlyNT| " |") - (DO ((G168032 (MIN (PLUS |start| 9) |n|)) + (DO ((G168032 (MIN (+ |start| 9) |n|)) (|j| |start| (+ |j| 1))) ((> |j| G168032) NIL) (SEQ (EXIT @@ -2755,16 +2755,16 @@ (SEQ (EXIT (COND ((ATOM (SPADLET |item| (ELT |template| |i|))) - (SPADLET |fun| (PLUS |fun| 1))) + (SPADLET |fun| (+ |fun| 1))) ((INTEGERP (CAR |item|)) - (SPADLET |latch| (PLUS |latch| 1))) - ('T (SPADLET |lazy| (PLUS |lazy| 1)) + (SPADLET |latch| (+ |latch| 1))) + ('T (SPADLET |lazy| (+ |lazy| 1)) (SPADLET |lazyNodes| - (PLUS |lazyNodes| + (+ |lazyNodes| (|numberOfNodes| |item|)))))))) (SPADLET |tSize| - (|sum| (|vectorSize| (PLUS 1 |maxindex|)) - (|nodeSize| (PLUS |lazyNodes| |latch|)))) + (|sum| (|vectorSize| (+ 1 |maxindex|)) + (|nodeSize| (+ |lazyNodes| |latch|)))) (SPADLET |oSize| (|vectorSize| (SIZE (ELT |infovec| 1)))) (SPADLET |aSize| (|numberOfNodes| (ELT |infovec| 2))) @@ -2777,7 +2777,7 @@ (SPADLET |cSize| (|sum| (|nodeSize| 2) (|vectorSize| (SIZE (CAR |slot4|))) - (|vectorSize| (PLUS |n| 1)) + (|vectorSize| (+ |n| 1)) (|nodeSize| (PROG (G168056) (SPADLET G168056 0) @@ -2788,7 +2788,7 @@ (SEQ (EXIT (SETQ G168056 - (PLUS G168056 + (+ G168056 (|numberOfNodes| (ELT |catvec| |i|)))))))))))) (SPADLET |codeVector| @@ -2845,11 +2845,11 @@ (CONS |lazy| NIL))) (|sayBrightly| (CONS "size of domain vectors = " - (CONS (PLUS 1 |maxindex|) + (CONS (+ 1 |maxindex|) (CONS " slots" NIL)))))) - (SPADLET |vtotal| (PLUS |itotal| (|nodeSize| |fun|))) + (SPADLET |vtotal| (+ |itotal| (|nodeSize| |fun|))) (SPADLET |vtotal| - (PLUS |vtotal| (|nodeSize| (TIMES 2 |latch|)))) + (+ |vtotal| (|nodeSize| (TIMES 2 |latch|)))) (COND ((NULL |quiet|) (|sayBrightly| @@ -2857,9 +2857,9 @@ (CONS |vtotal| (CONS " BYTES" NIL)))))) (SPADLET |etotal| - (PLUS (|nodeSize| - (PLUS |fun| (TIMES 2 |latch|))) - (|vectorSize| (PLUS 1 |maxindex|)))) + (+ (|nodeSize| + (+ |fun| (TIMES 2 |latch|))) + (|vectorSize| (+ 1 |maxindex|)))) (COND ((NULL |quiet|) (|sayBrightly| @@ -2893,13 +2893,13 @@ (SEQ (EXIT (COND ((NULL (ATOM (GETL |x| '|infovec|))) (PROGN - (SPADLET |count| (PLUS |count| 1)) + (SPADLET |count| (+ |count| 1)) (SPADLET |s| (|dcSize| |x| '|quiet|)) (|sayBrightly| (CONS |s| (CONS " : " (CONS |x| NIL)))) - (SPADLET |total| (PLUS |total| |s|)))))))) + (SPADLET |total| (+ |total| |s|)))))))) (|sayBrightly| "------------total-------------") (|sayBrightly| @@ -2921,7 +2921,7 @@ ((OR (ATOM G168131) (PROGN (SETQ G168125 (CAR G168131)) NIL)) G168126) - (SEQ (EXIT (SETQ G168126 (PLUS G168126 G168125))))))))))) + (SEQ (EXIT (SETQ G168126 (+ G168126 G168125))))))))))) ;nodeSize(n) == 12 * n @@ -2929,7 +2929,7 @@ ;vectorSize(n) == 4 * (1 + n) -(DEFUN |vectorSize| (|n|) (TIMES 4 (PLUS 1 |n|))) +(DEFUN |vectorSize| (|n|) (TIMES 4 (+ 1 |n|))) ;halfWordSize(n) == ; n < 128 => n / 2 @@ -2950,7 +2950,7 @@ (COND ((ATOM |x|) 0) ('T - (PLUS (PLUS 1 (|numberOfNodes| (CAR |x|))) + (+ (+ 1 (|numberOfNodes| (CAR |x|))) (|numberOfNodes| (CDR |x|)))))) ;template con == @@ -3639,7 +3639,7 @@ (EQ (QCDR |ISTMP#1|) NIL) (PROGN (SPADLET |x| (QCAR |ISTMP#1|)) 'T)))) (SPADLET |n| (POSN1 |x| |$FormalMapVariableList|)) - (ELT |domform| (PLUS 1 |n|))) + (ELT |domform| (+ 1 |n|))) ('T (CONS |functorName| (PROG (G168661) diff --git a/src/interp/parsing.lisp.pamphlet b/src/interp/parsing.lisp.pamphlet index ced9735..ff2495b 100644 --- a/src/interp/parsing.lisp.pamphlet +++ b/src/interp/parsing.lisp.pamphlet @@ -603,7 +603,7 @@ foo defined inside of fum gets renamed as fum,foo.") (|removeDuplicates| REMDUP) (|reverse| REVERSE) (|nreverse| NREVERSE) (|drop| DROP) (|take| TAKE) (|croak| CROAK) (|genvar| GENVAR) (|mkpf| MKPF) (^= NEQUAL) (= EQUAL) (- SPADDIFFERENCE) - (+ PLUS) (* TIMES) (/ QUOTIENT) + (* TIMES) (/ QUOTIENT) (** EXPT) (|return| RETURN) (|exit| EXIT) (\| SUCHTHAT) (^ NULL) (|not| NULL) (NOT NULL) (REDUCE spadReduce) (DO spadDo) (|atom| ATOM) (|nil| NIL) (|null| NULL) (GET GETL) diff --git a/src/interp/record.lisp.pamphlet b/src/interp/record.lisp.pamphlet index 46befcc..73f2b59 100644 --- a/src/interp/record.lisp.pamphlet +++ b/src/interp/record.lisp.pamphlet @@ -634,7 +634,7 @@ (|char| '|\\|)) (SETQ G166399 (OR G166399 |i|)))))))))) - (EXIT (SEQ (IF (|member| (ELT |s| (PLUS |k| 1)) + (EXIT (SEQ (IF (|member| (ELT |s| (+ |k| 1)) (CONS (|char| '|f|) (CONS (|char| '|b|) NIL))) (EXIT (SUBSTRING |s| |init| @@ -642,7 +642,7 @@ (EXIT (STRCONC (SUBSTRING |s| |init| (SPADDIFFERENCE |k| |init|)) (|htCommandToInputLine,fn| |s| - (PLUS |k| 1))))))) + (+ |k| 1))))))) (EXIT (SUBSTRING |s| |init| NIL)))))) (DEFUN |htCommandToInputLine| (|s|) (|htCommandToInputLine,fn| |s| 0)) @@ -675,7 +675,7 @@ (BOOT-EQUAL (ELT |s| |i|) |backslash|) (|member| - (ELT |s| (PLUS |i| 1)) + (ELT |s| (+ |i| 1)) (CONS (|char| '|f|) (CONS (|char| '|b|) NIL)))) (SETQ G166422 diff --git a/src/interp/server.lisp.pamphlet b/src/interp/server.lisp.pamphlet index 17c93d1..89a3deb 100644 --- a/src/interp/server.lisp.pamphlet +++ b/src/interp/server.lisp.pamphlet @@ -105,7 +105,7 @@ (|sockSendInt| |$SessionManager| |$frameNumber|) (SPADLET |$frameNumber| - (PLUS |$frameNumber| 1)) + (+ |$frameNumber| 1)) (|sockSendString| |$SessionManager| (MKPROMPT))) ((BOOT-EQUAL |action| |$SwitchFrames|) diff --git a/src/interp/slam.lisp.pamphlet b/src/interp/slam.lisp.pamphlet index 6107536..c84fb99 100644 --- a/src/interp/slam.lisp.pamphlet +++ b/src/interp/slam.lisp.pamphlet @@ -413,7 +413,7 @@ (PROGN (SETQ |key| (CAR G166145)) NIL)) G166140) (SEQ (EXIT (SETQ G166140 - (PLUS G166140 + (+ G166140 (1+ (|nodeCount| (HGET |table| |key|)))))))))))))) @@ -461,7 +461,7 @@ (QSGREATERP |i| |n|)) G166173) (SEQ (EXIT (SETQ G166173 - (PLUS G166173 (|nodeCount| |x|)))))))))))) + (+ G166173 (|nodeCount| |x|)))))))))))) ;predCircular(al,n) == ; for i in 1..QSSUB1 n repeat al:= QCDR al diff --git a/src/interp/template.lisp.pamphlet b/src/interp/template.lisp.pamphlet index 8d9a6c2..6b6a040 100644 --- a/src/interp/template.lisp.pamphlet +++ b/src/interp/template.lisp.pamphlet @@ -417,7 +417,7 @@ (COND ((> |dcIndex| 0) (SPADLET |code| - (PLUS |code| 2))) + (+ |code| 2))) ('T (SPADLET |dcIndex| (SPADDIFFERENCE @@ -425,9 +425,9 @@ (COND ((BOOT-EQUAL |flag| 'CONST) (SPADLET |code| - (PLUS |code| 1)))) + (+ |code| 1)))) (SPADLET |sourceIndex| - (PLUS (TIMES 8192 |dcIndex|) + (+ (TIMES 8192 |dcIndex|) |code|)) (SPADLET |uniqueSig| (|addConsDB| |sig|)) @@ -517,8 +517,8 @@ NIL) (SPADLET |index| (TIMES 8192 |predCode|)) (IF (AND (NUMBERP |slot|) (NEQUAL |slot| 0)) - (SPADLET |index| (PLUS |index| (TIMES 2 |slot|))) NIL) - (IF |isConstant| (SPADLET |index| (PLUS |index| 1)) NIL) + (SPADLET |index| (+ |index| (TIMES 2 |slot|))) NIL) + (IF |isConstant| (SPADLET |index| (+ |index| 1)) NIL) (EXIT (CONS |uniqueSig| |index|)))))) (DEFUN |makeOpDirect| (|u|) @@ -615,7 +615,7 @@ (|extendVectorSize| |$predVector|)))) (SETELT |$predVector| |$predVectorFrontier| |pred|) (SPADLET |$predVectorFrontier| - (PLUS |$predVectorFrontier| 1)) + (+ |$predVectorFrontier| 1)) (SPADDIFFERENCE |$predVectorFrontier| 1)))))))) ;extendVectorSize v == @@ -1138,7 +1138,7 @@ (PROG (|m|) (declare (special |$table| |$consDB|)) (RETURN - (SEQ (PLUS |n| + (SEQ (+ |n| (SEQ (IF (VECP |u|) (EXIT (PROG (G166901) (SPADLET G166901 0) @@ -1151,7 +1151,7 @@ (SEQ (EXIT (SETQ G166901 - (PLUS G166901 + (+ G166901 (|measureCommon,fn| (ELT |u| |i|) 0)))))))))) (IF (SPADDIFFERENCE (SPADDIFFERENCE HASH TABLE) @@ -1171,19 +1171,19 @@ (SEQ (EXIT (SETQ G166910 - (PLUS G166910 - (PLUS + (+ G166910 + (+ (|measureCommon,fn| |key| 0) (|measureCommon,fn| (HGET |u| |key|) 0))))))))))) (IF (CONSP |u|) (EXIT (SEQ (IF (HGET |$table| |u|) (EXIT 0)) (SPADLET |m| - (PLUS + (+ (|measureCommon,fn| (CAR |u|) 0) (|measureCommon,fn| (CDR |u|) 0))) (IF (HGET |$consDB| |u|) - (EXIT (PLUS 8 |m|))) + (EXIT (+ 8 |m|))) (HPUT |$table| |u| 'T) (EXIT |m|)))) (EXIT 0))))))) diff --git a/src/interp/topics.lisp.pamphlet b/src/interp/topics.lisp.pamphlet index b3ee0e5..d767011 100644 --- a/src/interp/topics.lisp.pamphlet +++ b/src/interp/topics.lisp.pamphlet @@ -300,11 +300,11 @@ (CONS (INTERN (SUBSTRING |s| |k| - (PLUS (SPADDIFFERENCE |k|) + (+ (SPADDIFFERENCE |k|) (SPADLET |k| (|charPosition| (|char| '| |) |s| - (PLUS |k| 1)))))) + (+ |k| 1)))))) |acc|))))) (SPADLET |acc| (NREVERSE |acc|)) (COND @@ -349,7 +349,7 @@ ((NULL (AND (> |m| |i|) (BOOT-EQUAL (ELT |u| |i|) |$charBlank|))) NIL) - (SEQ (EXIT (SPADLET |i| (PLUS |i| 1))))) + (SEQ (EXIT (SPADLET |i| (+ |i| 1))))) (COND ((>= |i| |m|) NIL) ('T |i|))))) ;--======================================================================= @@ -427,7 +427,7 @@ NIL)) G166280) (SEQ (EXIT (SETQ G166280 - (PLUS G166280 |i|))))))))))))) + (+ G166280 |i|))))))))))))) ;--======================================================================= ;-- Add Codes to Documentation Property diff --git a/src/interp/vmlisp.lisp.pamphlet b/src/interp/vmlisp.lisp.pamphlet index 3810d12..251ca55 100644 --- a/src/interp/vmlisp.lisp.pamphlet +++ b/src/interp/vmlisp.lisp.pamphlet @@ -2621,10 +2621,10 @@ for primitive domains. Also used by putInLocalDomainReferences and optCal (CDR X) (LIST X))))))) (DEFUN MKPF1 (L OP) - (let (X) (case OP (PLUS (COND ((EQL 0 (SETQ X (LENGTH + (let (X) (case OP (+ (COND ((EQL 0 (SETQ X (LENGTH (SETQ L (S- L '(0 (ZERO))))))) 0) ((EQL 1 X) (CAR L)) - ((CONS 'PLUS L)) )) + ((CONS '+ L)) )) (TIMES (COND ((S* L '(0 (ZERO))) 0) ((EQL 0 (SETQ X (LENGTH (SETQ L (S- L '(1 (ONE))))))) 1) @@ -2643,7 +2643,7 @@ for primitive domains. Also used by putInLocalDomainReferences and optCal ((|member| (CAR L) '(0 (ZERO))) (MKPF (CDR L) 'MINUS)) ((|member| (CADR L) '(0 (ZERO))) (CAR L)) ((EQCAR (CADR L) 'MINUS) - (MKPF (LIST (CAR L) (CADADR L)) 'PLUS)) + (MKPF (LIST (CAR L) (CADADR L)) '+)) ((CONS 'DIFFERENCE L)) )) (EXPT (COND ((> (LENGTH L) 2) (FAIL)) ((EQL 0 (CADR L)) 1) @@ -2995,10 +2995,6 @@ LP (COND ((NULL X) ; 10.7 CATCH and THROW -(defmacro SPADCATCH (&rest form) (CONS 'CATCH form)) - -(defmacro SPADTHROW (&rest form) (CONS 'THROW form)) - ; 12 NUMBERS ; 12.3 Comparisons on Numbers @@ -3259,7 +3255,7 @@ LP (COND ((NULL X) ((EQL N 2) '(CDDR)) ((EQL N 3) '(CDDDR)) ((EQL N 4) '(CDDDDR)) - ((APPEND (PARTCODET (PLUS N -4)) '(CDDDDR))))) + ((APPEND (PARTCODET (+ N -4)) '(CDDDDR))))) (defmacro TL (&rest L) `(tail . ,L)) @@ -3798,7 +3794,7 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size (COND ((NULL |inWord|) (SPADLET |inWord| 'T) - (SPADLET |n| (PLUS |n| 1)))) + (SPADLET |n| (+ |n| 1)))) (COND ((eql |n| N) (cond ((eq |word| '||) @@ -4484,7 +4480,7 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size ; on and off (defun |startTimer| () - (SETQ $delay (PLUS $delay (- (get-internal-run-time) |$oldTime|))) + (SETQ $delay (+ $delay (- (get-internal-run-time) |$oldTime|))) (SETQ |$timerOn| 'T) (|clock|)) @@ -5381,7 +5377,6 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" ;; Many of the following are now in COMPAT LISP (REPEAT (IN X '( - (+ PLUS) (|and| AND) (|append| APPEND) (|apply| APPLY) @@ -5446,54 +5441,6 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" (UNION |union|) )) (setf (get (first x) 'rename) (rest x))) -;; these are accessor names for fields in data structures. Thus one would -;; write datastructure.setName -(REPEAT (IN X '( - (|setName| 0) - (|setLabel| 1) - (|setLevel| 2) - (|setType| 3) - (|setVar| 4) - (|setLeaf| 5) - (|setDef| 6) - (|aGeneral| 4) - (|aMode| 1) - (|aModeSet| 3) - (|aTree| 0) - (|attributes| CADDR) - (|aValue| 2) - (|cacheCount| CADDDDR) - (|cacheName| CADR) - (|cacheReset| CADDDR) - (|cacheType| CADDR) - (|env| CADDR) - (|expr| CAR) - (|first| CAR) - (|mmCondition| CAADR) - (|mmDC| CAAR) - (|mmImplementation| CADADR) - (|mmSignature| CDAR) - (|mmTarget| CADAR) - (|mode| CADR) - (|op| CAR) - (|opcode| CADR) - (|opSig| CADR) - (|rest| CDR) - (|sig| CDDR) - (|source| CDR) - (|streamCode| CADDDR) - (|streamDef| CADDR) - (|streamName| CADR) - (|target| CAR) -)) (setf (get (first x) '|SEL,FUNCTION|) (second x))) - -(REPEAT (IN X '( - (\: |compColonInteractive|) - (DEF |compDefineInteractive|) - (|construct| |compConstructInteractive|) - (LET |compSetqInteractive|) -)) (setf (get (first x) 'interactive) (second x))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; -- 1.7.5.4