diff --git a/books/bookvol5.pamphlet b/books/bookvol5.pamphlet index 5fe0d62..0b6d820 100644 --- a/books/bookvol5.pamphlet +++ b/books/bookvol5.pamphlet @@ -22903,7 +22903,7 @@ in practice. (do ((t2 (|synonymsForUserLevel| |$CommandSynonymAlist|) (cdr t2))) ((atom t2) (nreverse0 t1)) (push (cons (princ-to-string (caar t2)) (cdar t2)) t1)) - (|function| car))) + #'car)) (|printLabelledList| ls "user" "synonyms" ")" patterns))) \end{chunk} @@ -27938,7 +27938,7 @@ back. (defun |writify| (ob) (let (|$seen| |$writifyComplained|) (declare (special |$seen| |$writifyComplained|)) - (if (null (|ScanOrPairVec| (|function| |unwritable?|) ob)) + (if (null (|ScanOrPairVec| #'|unwritable?| ob)) ob (progn (setq |$seen| (make-hash-table :test #'eq)) @@ -32164,7 +32164,7 @@ recurrence specially compile recurrence relations on (let (prefix phrase) (setq prefix (cond - (fn (cons '|function| (|bright| (|linearFormatName| fn)))) + (fn (cons 'function (|bright| (|linearFormatName| fn)))) ((eql n 0) (list '|interpreter functions |)) (t (list '|In general, interpreter functions |)))) (cond @@ -41501,7 +41501,7 @@ in patterns. (setq l (|filterListOfStringsWithFn| patterns (|whatConstructors| constrType) - (|function| cdr))) + #'cdr)) (cond (patterns (cond ((null l) @@ -44665,7 +44665,7 @@ database format. \begin{chunk}{defun isSystemDirectory} (defun |isSystemDirectory| (dir) (declare (special $spadroot)) - (every (|function| char=) $spadroot dir)) + (every #'char= $spadroot dir)) \end{chunk} @@ -53047,7 +53047,7 @@ Given \verb|("one" "two" "three")| generate \verb|"(one,two,three)"| (setq |$newPage| nil) (setq |$htLineList| nil) (|htMakePage| (|htpPageDescription| |$curPage|)) - (setq line (apply (|function| CONCAT) (NREVERSE |$htLineList|))) + (setq line (apply #'CONCAT (NREVERSE |$htLineList|))) (|issueHT| line) (|endHTPage|))))) @@ -53128,7 +53128,7 @@ Given \verb|("one" "two" "three")| generate \verb|"(one,two,three)"| (setq |$htLineList| nil) (setq |$curPage| htPage) (|htMakePage| (|htpPageDescription| htPage)) - (setq line (apply (|function| CONCAT) (NREVERSE |$htLineList|))) + (setq line (apply #'CONCAT (NREVERSE |$htLineList|))) (|issueHT| line) (|endHTPage|))))) @@ -54348,7 +54348,7 @@ Given \verb|("one" "two" "three")| generate \verb|"(one,two,three)"| (cond ((consp typeString) (setq typeString - (apply (|function| CONCAT) typeString)))) + (apply #'CONCAT typeString)))) (CONCAT "Error: Could not make your input into a " typeString))))) @@ -54433,7 +54433,7 @@ Given \verb|("one" "two" "three")| generate \verb|"(one,two,three)"| (CONCAT arg ", ") argList))))) (setq argList (NREVERSE (cons lastArg argList))) - (CONCAT opForm (apply (|function| CONCAT) argList) + (CONCAT opForm (apply #'CONCAT argList) ")")))))) \end{chunk} @@ -54456,7 +54456,7 @@ Given \verb|("one" "two" "three")| generate \verb|"(one,two,three)"| (CONCAT arg ", ") argList))))) (setq argList (NREVERSE (cons lastArg argList))) - (|bracketString| (apply (|function| CONCAT) argList))))))) + (|bracketString| (apply #'CONCAT argList))))))) \end{chunk} @@ -56672,7 +56672,7 @@ Given \verb|("one" "two" "three")| generate \verb|"(one,two,three)"| (setq alist keepList)) (dolist (pair alist) (rplacd pair (|simpHasPred| (cdr pair)))) - (|listSort| (|function| glesseqp) alist)))) + (|listSort| #'glesseqp alist)))) (if (consp conform) (cond ((eq (qcar conform) '|Join|) @@ -57229,7 +57229,7 @@ There are 8 parts of an htPage: (defun |kcaPage| (htPage junk) (declare (ignore junk)) (|kcaPage1| htPage "category" " an " - "ancestor" (|function| |ancestorsOf|) nil)) + "ancestor" #'|ancestorsOf| nil)) \end{chunk} @@ -57240,7 +57240,7 @@ There are 8 parts of an htPage: (defun |kcdPage| (htPage junk) (declare (ignore junk)) (|kcaPage1| htPage "category" " a " - "descendant" (|function| |descendantsOf|) t)) + "descendant" #'|descendantsOf| t)) \end{chunk} @@ -57251,7 +57251,7 @@ There are 8 parts of an htPage: (defun |kcdoPage| (htPage junk) (declare (ignore junk)) (|kcaPage1| htPage "domain" " a " - "descendant" (|function| |domainsOf|) nil)) + "descendant" #'|domainsOf| nil)) \end{chunk} @@ -57291,7 +57291,7 @@ There are 8 parts of an htPage: (setq ancestors (FUNCALL fn conform domname)) (unless (string= whichever "ancestor") (setq ancestors (|augmentHasArgs| ancestors conform))) - (setq ancestors (|listSort| (|function| glesseqp) ancestors)) + (setq ancestors (|listSort| #'glesseqp ancestors)) (|htpSetProperty| htPage '|cAlist| ancestors) (|htpSetProperty| htPage '|thing| whichever) (setq choice '|names|) @@ -57691,8 +57691,8 @@ There are 8 parts of an htPage: \begin{chunk}{defun parseNoMacroFromString} (defun |parseNoMacroFromString| (s) (setq s - (|next| (|function| |ncloopParse|) - (|next| (|function| |lineoftoks|) + (|next| #'|ncloopParse| + (|next| #'|lineoftoks| (|incString| s)))) (if (|StreamNull| s) nil @@ -58387,7 +58387,7 @@ There are 8 parts of an htPage: (setq flist (for con in conlist collect (getdatabase con 'sourcefile))) (|bcUnixTable| - (|listSort| (|function| glesseqp) (remdup flist)))) + (|listSort| #'glesseqp (remdup flist)))) ((eq key '|documentation|) (|dbShowConsDoc| page conlist)) (t (when |$exposedOnlyIfTrue| @@ -58645,7 +58645,7 @@ There are 8 parts of an htPage: (setq cAlist (loop for line in lines collect (cons (|getConstructorForm| (|intern| (|dbName| line))) t))) - (|dbShowCons1| nil (|listSort| (|function| glesseqp) cAlist) '|names|))) + (|dbShowCons1| nil (|listSort| #'glesseqp cAlist) '|names|))) \end{chunk} diff --git a/books/bookvol9.pamphlet b/books/bookvol9.pamphlet index 06e7505..7292dd4 100644 --- a/books/bookvol9.pamphlet +++ b/books/bookvol9.pamphlet @@ -9914,7 +9914,7 @@ optPackageCall. (cond ((eq (caaar x) 'const) (cond - ((equal (kar (elt yval n)) (|function| |Undef|)) + ((equal (kar (elt yval n)) #'|Undef|) (|keyedSystemError| 'S2GE0016 (list "optSpecialCall" "invalid constant"))) (t (mkq (elt yval n))))) @@ -25625,7 +25625,7 @@ but there is no handler listed for the form (See \ref{handlers}). (t (setq op (car form)) (setq env (car (reverse (cdr form)))) - (list (list 'cons (list '|function| op) env) mode oldE))))) + (list (list 'cons (list 'function op) env) mode oldE))))) \end{chunk} @@ -25743,7 +25743,7 @@ symbol in the free list are represented by the alist (symbol . count) (progn (setq op (car u)) (cond - ((member op '(quote go |function|)) free) + ((member op '(quote go function)) free) ((eq op 'lambda) ; lambdas bind symbols (setq bound (unionq bound (second u))) (dolist (v (cddr u)) diff --git a/changelog b/changelog index b1411b0..371a773 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,27 @@ +20141222 tpd src/axiom-website/patches.html 20141222.01.tpd.patch +20141222 tpd books/bookvol5 remove |function| +20141222 tpd books/bookvol9 remove |function| +20141222 tpd src/interp/br-con.lisp remove |function| +20141222 tpd src/interp/buildom.lisp remove |function| +20141222 tpd src/interp/c-doc.lisp remove |function| +20141222 tpd src/interp/c-util.lisp remove |function| +20141222 tpd src/interp/cattable.lisp remove |function| +20141222 tpd src/interp/clam.lisp remove |function| +20141222 tpd src/interp/clammed.lisp remove |function| +20141222 tpd src/interp/g-util.lisp remove |function| +20141222 tpd src/interp/i-coerce.lisp remove |function| +20141222 tpd src/interp/i-eval.lisp remove |function| +20141222 tpd src/interp/i-funsel.lisp remove |function| +20141222 tpd src/interp/i-map.lisp remove |function| +20141222 tpd src/interp/i-spec1.lisp remove |function| +20141222 tpd src/interp/interop.lisp remove |function| +20141222 tpd src/interp/newfort.lisp remove |function| +20141222 tpd src/interp/nruncomp.lisp remove |function| +20141222 tpd src/interp/nrunopt.lisp remove |function| +20141222 tpd src/interp/slam.lisp remove |function| +20141222 tpd src/interp/sys-pkg.lisp remove |function| +20141222 tpd src/interp/template.lisp remove |function| +20141222 tpd src/interp/vmlisp.lisp remove |function| 20141221 tpd src/axiom-website/patches.html 20141221.01.tpd.patch 20141221 tpd books/bookvol5 resolve undefined references 20141218 tpd src/axiom-website/patches.html 20141218.01.tpd.patch diff --git a/patch b/patch index 124fad2..ff06ea8 100644 --- a/patch +++ b/patch @@ -1,3 +1,3 @@ -books/bookvol5 resolve undefined references +src/interp/vmlisp.lisp remove |function| -The cross references are missing for some functions and variables. +Use common lisp syntax in place of |function| diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html index a079189..035294f 100644 --- a/src/axiom-website/patches.html +++ b/src/axiom-website/patches.html @@ -4832,6 +4832,8 @@ books/bookvol5 inline structure accesses for frames
books/bookvol5 make )quit unprotected by default
20141221.01.tpd.patch books/bookvol5 resolve undefined references
+20141222.01.tpd.patch +src/interp/vmlisp.lisp remove |function|
diff --git a/src/interp/br-con.lisp.pamphlet b/src/interp/br-con.lisp.pamphlet index 399bfb2..121356a 100644 --- a/src/interp/br-con.lisp.pamphlet +++ b/src/interp/br-con.lisp.pamphlet @@ -699,7 +699,7 @@ (PLUS |n| 1) NIL) |text|)))))))))) (ASSOCRIGHT - (|listSort| (|function| GLESSEQP) + (|listSort| #'GLESSEQP (PROG (G168739) (SPADLET G168739 NIL) (RETURN @@ -776,7 +776,7 @@ (PROGN (SETQ |k| (CAR G168798)) NIL)) NIL) (SEQ (EXIT (HPUT |$usersTb| |k| - (|listSort| (|function| GLESSEQP) + (|listSort| #'GLESSEQP (HGET |$usersTb| |k|)))))) (DO ((G168808 (|allConstructors|) (CDR G168808)) (|x| NIL)) @@ -847,7 +847,7 @@ (CONS (CAAR |x|) G168842))))))) |acc|)))))) - (|listSort| (|function| GLESSEQP) |acc|)))))) + (|listSort| #'GLESSEQP |acc|)))))) ;--============================================================================ ;-- Build Dependents Hashtable @@ -889,7 +889,7 @@ (PROGN (SETQ |k| (CAR G168885)) NIL)) NIL) (SEQ (EXIT (HPUT |$depTb| |k| - (|listSort| (|function| GLESSEQP) + (|listSort| #'GLESSEQP (HGET |$depTb| |k|)))))) |$depTb|))) @@ -1141,7 +1141,7 @@ (|getImports,import| |i| |template|) G169018)))))))))) - (|listSort| (|function| GLESSEQP) + (|listSort| #'GLESSEQP (SUBLISLIS (CDR |conform|) |$FormalMapVariableList| |u|))))))) @@ -1649,7 +1649,7 @@ (|ancestorsRecur| |conform| |domform| 'T 'T) (SPADLET |acc| NIL) (DO ((G169437 - (|listSort| (|function| GLESSEQP) (HKEYS |$if|)) + (|listSort| #'GLESSEQP (HKEYS |$if|)) (CDR G169437)) (|op| NIL)) ((OR (ATOM G169437) @@ -1811,7 +1811,7 @@ (SETQ G169512 (CONS |key| G169512)))))))))) (SPADLET |s| - (|listSort| (|function| GLESSEQP) (COPY |u|))) + (|listSort| #'GLESSEQP (COPY |u|))) (SPADLET |s| (PROG (G169528) (SPADLET G169528 NIL) @@ -1830,7 +1830,7 @@ 'HASCATEGORY)) G169528)))))))) (|transKCatAlist| |conform| |domname| - (|listSort| (|function| GLESSEQP) |s|))))))) + (|listSort| #'GLESSEQP |s|))))))) ;catsOf(conform,domname,:options) == ; $hasArgList := IFCAR options @@ -1889,7 +1889,7 @@ (|insertShortAlist| |key| |newItem| |alist|))))))))))) (|transKCatAlist| |conform| |domname| - (|listSort| (|function| GLESSEQP) |alist|))))))) + (|listSort| #'GLESSEQP |alist|))))))) ;transKCatAlist(conform,domname,s) == main where ; main == @@ -2480,7 +2480,7 @@ (SPADLET |domname| (ELT D 0)) (SPADLET |conname| (CAR |domname|)) (SPADLET |$predicateList| (GETDATABASE |conname| 'PREDICATES)) - (REMDUP (|listSort| (|function| GLESSEQP) + (REMDUP (|listSort| #'GLESSEQP (ASSOCLEFT (|getDomainOpTable| D NIL)))))))) ;getDomainSigs(D,:option) == @@ -2506,7 +2506,7 @@ (DEFUN |getDomainSigs1| (D |ops|) (PROG () (RETURN - (SEQ (|listSort| (|function| GLESSEQP) + (SEQ (|listSort| #'GLESSEQP (PROG (G170019) (SPADLET G170019 NIL) (RETURN @@ -4441,19 +4441,19 @@ (SPADLET |$dbDataFunctionAlist| (CONS (CONS '|signatures| - (|function| |dbMakeSignature|)) + #'|dbMakeSignature|) (CONS (CONS '|parameters| - (|function| |dbContrivedForm|)) + #'|dbContrivedForm|) (CONS (CONS '|origins| - (|function| |dbGetOrigin|)) + #'|dbGetOrigin|) (CONS (CONS '|domains| - (|function| |dbGetOrigin|)) + #'|dbGetOrigin|) (CONS (CONS '|conditions| - (|function| |dbGetCondition|)) + #'|dbGetCondition|) NIL))))))))) (COND ((NULL |dataFunction|) @@ -4614,10 +4614,10 @@ ((ATOM |tail|) |tail|) ('T (|listSort| - (|function| LEXLESSEQP) |tail|)))) + #'LEXLESSEQP |tail|)))) (RPLACD (CDR |entry|) |tail|))))))) (SPADLET |data| - (|listSort| (|function| LEXLESSEQP) |data|)) + (|listSort| #'LEXLESSEQP |data|)) |data|)))))))) ;dbGatherDataImplementation(htPage,opAlist) == @@ -4803,9 +4803,9 @@ ((BOOT-EQUAL |branch| '|signatures|) (|dbReduceBySignature| |opAlist| (CAAR |data|) (CADAR |data|))) ((BOOT-EQUAL |branch| '|origins|) - (|dbReduceBySelection| |opAlist| (CAR |data|) (|function| CADDR))) + (|dbReduceBySelection| |opAlist| (CAR |data|) #'CADDR)) ((BOOT-EQUAL |branch| '|conditions|) - (|dbReduceBySelection| |opAlist| (CAR |data|) (|function| CADR))) + (|dbReduceBySelection| |opAlist| (CAR |data|) #'CADR)) ((BOOT-EQUAL |branch| '|implementation|) (|dbReduceByOpSignature| |opAlist| (CDDR |data|))) ((BOOT-EQUAL |branch| '|parameters|) @@ -5366,7 +5366,7 @@ (|simpOrDumb| |pred| (OR (LASSQ |dom| |u|) 'T)) |u|))))) - (SPADLET |cAlist| (|listSort| (|function| GLESSEQP) |u|)) + (SPADLET |cAlist| (|listSort| #'GLESSEQP |u|)) (DO ((G171791 |cAlist| (CDR G171791)) (|pair| NIL)) ((OR (ATOM G171791) (PROGN (SETQ |pair| (CAR G171791)) NIL)) @@ -5397,21 +5397,21 @@ (DEFUN |dbShowOpOrigins| (|htPage| |opAlist| |which| |data|) (|dbGatherThenShow| |htPage| |opAlist| |which| |data| 'T - "from" (|function| |bcStarConform|))) + "from" #'|bcStarConform|)) ;dbShowOpImplementations(htPage,opAlist,which,data) == ; dbGatherThenShow(htPage,opAlist,which,data,true,'"by",function bcStarConform) (DEFUN |dbShowOpImplementations| (|htPage| |opAlist| |which| |data|) (|dbGatherThenShow| |htPage| |opAlist| |which| |data| 'T - "by" (|function| |bcStarConform|))) + "by" #'|bcStarConform|)) ;dbShowOpConditions(htPage,opAlist,which,data) == ; dbGatherThenShow(htPage,opAlist,which,data,nil,nil,function bcPred) (DEFUN |dbShowOpConditions| (|htPage| |opAlist| |which| |data|) (|dbGatherThenShow| |htPage| |opAlist| |which| |data| NIL NIL - (|function| |bcPred|))) + #'|bcPred|)) ;dbShowKind conform == ; conname := CAR conform @@ -6174,7 +6174,7 @@ (CONS |name| (NREVERSE |pile|)) |opAlist|)))))) (SPADLET |opAlist| - (|listSort| (|function| LEXLESSEQP) + (|listSort| #'LEXLESSEQP (NREVERSE |opAlist|))) (COND ((BOOT-EQUAL |which| "operation") @@ -7135,8 +7135,7 @@ '|constant|) ((BOOT-EQUAL |f| - (|function| - IDENTITY)) + #'IDENTITY) '|constant|) ((BOOT-EQUAL |f| @@ -8343,7 +8342,7 @@ (|sublisFormal| |conargs| |sig|))) (|htSay| "}\\newline") (|bcConTable| - (|listSort| (|function| GLESSEQP) + (|listSort| #'GLESSEQP (REMDUP |namelist|))))))) (SPADLET |noOneUses| (SETDIFFERENCE |opl| |usedList|)) (COND @@ -8729,7 +8728,7 @@ (SETQ G173702 (CONS (CONS |a| |pred|) G173702)))))))))) - (|listSort| (|function| GLESSEQP) (|koAttrs,fn| |u|))))))))) + (|listSort| #'GLESSEQP (|koAttrs,fn| |u|))))))))) ;koOps(conform,domname,:options) == main where ;--returns alist of form ((op (sig . pred) ...) ...) @@ -8933,7 +8932,7 @@ (PROGN (SPADLET |$packageItem| NIL) (SPADLET |ours| (|koOps,fn| |conform| |domname|)) - (|listSort| (|function| GLESSEQP) (|koOps,trim| |ours|)))))) + (|listSort| #'GLESSEQP (|koOps,trim| |ours|)))))) ;zeroOneConvert x == ; x = 'Zero => 0 @@ -9131,7 +9130,7 @@ (SPADLET G174022 NIL) (RETURN (DO ((G174027 - (|listSort| (|function| GLESSEQP) + (|listSort| #'GLESSEQP (HKEYS |$if|)) (CDR G174027)) (|op| NIL)) @@ -9237,7 +9236,7 @@ (SPADLET |ancestors| (ASSOCLEFT (|ancestorsOf| |conform| |domname|))) (|htpSetProperty| |page| '|ancestors| - (|listSort| (|function| GLESSEQP) |ancestors|)) + (|listSort| #'GLESSEQP |ancestors|)) (|bcNameCountTable| |ancestors| '|form2HtString| '|koaPageFilterByCategory1| 'T) (|htShowPage|))))) @@ -11055,7 +11054,7 @@ (SPADLET |op| (|opOf| |form|)) (COND ((|looksLikeDomainForm| |form|) - (APPLY (|function| |conPage|) |form|)) + (APPLY #'|conPage| |form|)) ('T (|conPage| |op|))))))) ;looksLikeDomainForm x == @@ -14849,7 +14848,7 @@ $dbKindAlist := (DSETQ |u| G177169) (PROGN (|htSay| "{\\em ") - (APPLY (|function| |dbSayItems|) |u|) + (APPLY #'|dbSayItems| |u|) (|htSay| "}"))) ;dbSayItems(countOrPrefix,singular,plural,:options) == @@ -15310,7 +15309,7 @@ $dbKindAlist := ;mySort u == listSort(function GLESSEQP,u) -(DEFUN |mySort| (|u|) (|listSort| (|function| GLESSEQP) |u|)) +(DEFUN |mySort| (|u|) (|listSort| #'GLESSEQP |u|)) ;--====================> WAS b-prof.boot <================================ ;--============================================================================ @@ -16773,7 +16772,7 @@ $dbKindAlist := (COND (|$htLineList| (SPADLET |line| - (APPLY (|function| CONCAT) + (APPLY #'CONCAT (NREVERSE |$htLineList|))))) (|issueHTStandard| |line|))) (COND @@ -16782,7 +16781,7 @@ $dbKindAlist := (COND (|$htLineList| (SPADLET |line| - (APPLY (|function| CONCAT) + (APPLY #'CONCAT (NREVERSE |$htLineList|))))) (|issueHTSaturn| |line|))) (|endHTPage|))))) @@ -16904,7 +16903,7 @@ $dbKindAlist := (COND (|$saturn| (SPADLET |$saturnPage| |htPage|))) (|htMakePage| (|htpPageDescription| |htPage|)) (SPADLET |line| - (APPLY (|function| CONCAT) (NREVERSE |$htLineList|))) + (APPLY #'CONCAT (NREVERSE |$htLineList|))) (|issueHT| |line|) (|endHTPage|))))) diff --git a/src/interp/buildom.lisp.pamphlet b/src/interp/buildom.lisp.pamphlet index 89d024a..765252a 100644 --- a/src/interp/buildom.lisp.pamphlet +++ b/src/interp/buildom.lisp.pamphlet @@ -96,7 +96,7 @@ NIL))) G166069))))))))) (SETELT |dom| 1 - (CONS (|function| |lookupInTable|) + (CONS #'|lookupInTable| (CONS |dom| (CONS (CONS (CONS '= @@ -135,9 +135,9 @@ (NREVERSE0 G166084)) (SEQ (EXIT (SETQ G166084 (CONS (CDR |a|) G166084)))))))) - (SETELT |dom| 6 (CONS (|function| |RecordEqual|) |dom|)) - (SETELT |dom| 7 (CONS (|function| |RecordPrint|) |dom|)) - (SETELT |dom| 8 (CONS (|function| |Undef|) |dom|)) + (SETELT |dom| 6 (CONS #'|RecordEqual| |dom|)) + (SETELT |dom| 7 (CONS #'|RecordPrint| |dom|)) + (SETELT |dom| 8 (CONS #'|Undef| |dom|)) (SETELT |dom| 9 (COND ((<= (SPADLET |n| (LENGTH |args|)) 2) @@ -371,7 +371,7 @@ ('T (|devaluate| |a|))) G166195))))))))) (SETELT |dom| 1 - (CONS (|function| |lookupInTable|) + (CONS #'|lookupInTable| (CONS |dom| (CONS (CONS (CONS '= @@ -397,9 +397,9 @@ (CONS (CONS '(|SetCategory|) NIL) (CONS (CONS '(|SetCategory|) NIL) NIL))) (SETELT |dom| 5 |args|) - (SETELT |dom| 6 (CONS (|function| |UnionEqual|) |dom|)) - (SETELT |dom| 7 (CONS (|function| |UnionPrint|) |dom|)) - (SETELT |dom| 8 (CONS (|function| |Undef|) |dom|)) + (SETELT |dom| 6 (CONS #'|UnionEqual| |dom|)) + (SETELT |dom| 7 (CONS #'|UnionPrint| |dom|)) + (SETELT |dom| 8 (CONS #'|Undef| |dom|)) |dom|))))) ;UnionEqual(x, y, dom) == @@ -563,7 +563,7 @@ (CONS (|devaluate| |a|) G166306))))))))) (SETELT |dom| 1 - (CONS (|function| |lookupInTable|) + (CONS #'|lookupInTable| (CONS |dom| (CONS (CONS (CONS '= @@ -589,9 +589,9 @@ (CONS (CONS '(|SetCategory|) NIL) (CONS (CONS '(|SetCategory|) NIL) NIL))) (SETELT |dom| 5 |args|) - (SETELT |dom| 6 (CONS (|function| |MappingEqual|) |dom|)) - (SETELT |dom| 7 (CONS (|function| |MappingPrint|) |dom|)) - (SETELT |dom| 8 (CONS (|function| |Undef|) |dom|)) + (SETELT |dom| 6 (CONS #'|MappingEqual| |dom|)) + (SETELT |dom| 7 (CONS #'|MappingPrint| |dom|)) + (SETELT |dom| 8 (CONS #'|Undef| |dom|)) |dom|))))) ;MappingEqual(x, y, dom) == EQ(x,y) @@ -654,7 +654,7 @@ (SPADLET |dom| (make-array 9)) (SETELT |dom| 0 (CONS '|Enumeration| |args|)) (SETELT |dom| 1 - (CONS (|function| |lookupInTable|) + (CONS #'|lookupInTable| (CONS |dom| (CONS (CONS (CONS '= (CONS @@ -685,9 +685,9 @@ (CONS (CONS '(|SetCategory|) NIL) (CONS (CONS '(|SetCategory|) NIL) NIL))) (SETELT |dom| 5 |args|) - (SETELT |dom| 6 (CONS (|function| |EnumEqual|) |dom|)) - (SETELT |dom| 7 (CONS (|function| |EnumPrint|) |dom|)) - (SETELT |dom| 8 (CONS (|function| |createEnum|) |dom|)) + (SETELT |dom| 6 (CONS #'|EnumEqual| |dom|)) + (SETELT |dom| 7 (CONS #'|EnumPrint| |dom|)) + (SETELT |dom| 8 (CONS #'|createEnum| |dom|)) |dom|)))) (DEFMACRO |Enumeration| (&WHOLE G166340 &REST G166341 &AUX G166338) diff --git a/src/interp/c-doc.lisp.pamphlet b/src/interp/c-doc.lisp.pamphlet new file mode 100644 index 0000000..44dab1d --- /dev/null +++ b/src/interp/c-doc.lisp.pamphlet @@ -0,0 +1,1845 @@ +\documentclass{article} +\usepackage{axiom} +\begin{document} +\title{\$SPAD/src/interp c-doc.lisp} +\author{The Axiom Team} +\maketitle +\begin{abstract} +\end{abstract} +\eject +\tableofcontents +\eject +\begin{chunk}{*} + +(IN-PACKAGE "BOOT" ) + +;getDoc(conName,op,modemap) == +; [dc,target,sl,pred,D] := simplifyModemap modemap +; sig := [target,:sl] +; null atom dc => +; sig := SUBST('$,dc,sig) +; sig := SUBLISLIS($FormalMapVariableList,rest dc,sig) +; getDocForDomain(conName,op,sig) +; if argList := IFCDR getOfCategoryArgument pred then +; SUBLISLIS($FormalMapArgumentList,argList,sig) +; sig := SUBST('$,dc,sig) +; getDocForCategory(conName,op,sig) + +;(DEFUN |getDoc| (|conName| |op| |modemap|) +; (PROG (|LETTMP#1| |dc| |target| |sl| |pred| D |argList| |sig|) +; (declare (special |$FormalMapArgumentList|)) +; (RETURN +; (PROGN +; (SPADLET |LETTMP#1| (|simplifyModemap| |modemap|)) +; (SPADLET |dc| (CAR |LETTMP#1|)) +; (SPADLET |target| (CADR |LETTMP#1|)) +; (SPADLET |sl| (CADDR |LETTMP#1|)) +; (SPADLET |pred| (CADDDR |LETTMP#1|)) +; (SPADLET D (CAR (CDDDDR |LETTMP#1|))) +; (SPADLET |sig| (CONS |target| |sl|)) +; (COND +; ((NULL (ATOM |dc|)) (SPADLET |sig| (MSUBST '$ |dc| |sig|)) +; (SPADLET |sig| +; (SUBLISLIS |$FormalMapVariableList| (CDR |dc|) +; |sig|)) +; (|getDocForDomain| |conName| |op| |sig|)) +; ('T +; (COND +; ((SPADLET |argList| +; (IFCDR (|getOfCategoryArgument| |pred|))) +; (SUBLISLIS |$FormalMapArgumentList| |argList| |sig|))) +; (SPADLET |sig| (MSUBST '$ |dc| |sig|)) +; (|getDocForCategory| |conName| |op| |sig|))))))) + +;getOfCategoryArgument pred == +; pred is [fn,:.] and MEMQ(fn,'(AND OR NOT)) => +; or/[getOfCategoryArgument x for x in rest pred] +; pred is ['ofCategory,'_*1,form] => form +; nil + +;(DEFUN |getOfCategoryArgument| (|pred|) +; (PROG (|fn| |ISTMP#1| |ISTMP#2| |form|) +; (RETURN +; (SEQ (COND +; ((AND (CONSP |pred|) +; (PROGN (SPADLET |fn| (QCAR |pred|)) 'T) +; (member |fn| '(AND OR NOT))) +; (PROG (G166100) +; (SPADLET G166100 NIL) +; (RETURN +; (DO ((G166106 NIL G166100) +; (G166107 (CDR |pred|) (CDR G166107)) +; (|x| NIL)) +; ((OR G166106 (ATOM G166107) +; (PROGN (SETQ |x| (CAR G166107)) NIL)) +; G166100) +; (SEQ (EXIT (SETQ G166100 +; (OR G166100 +; (|getOfCategoryArgument| |x|))))))))) +; ((AND (CONSP |pred|) (EQ (QCAR |pred|) '|ofCategory|) +; (PROGN +; (SPADLET |ISTMP#1| (QCDR |pred|)) +; (AND (CONSP |ISTMP#1|) (EQ (QCAR |ISTMP#1|) '*1) +; (PROGN +; (SPADLET |ISTMP#2| (QCDR |ISTMP#1|)) +; (AND (CONSP |ISTMP#2|) +; (EQ (QCDR |ISTMP#2|) NIL) +; (PROGN +; (SPADLET |form| (QCAR |ISTMP#2|)) +; 'T)))))) +; |form|) +; ('T NIL)))))) + +;getDocForCategory(name,op,sig) == +; getOpDoc(constructor? name,op,sig) or +; or/[getOpDoc(constructor? x,op,sig) for x in whatCatCategories name] + +;(DEFUN |getDocForCategory| (|name| |op| |sig|) +; (PROG () +; (RETURN +; (SEQ (OR (|getOpDoc| (|constructor?| |name|) |op| |sig|) +; (PROG (G166122) +; (SPADLET G166122 NIL) +; (RETURN +; (DO ((G166128 NIL G166122) +; (G166129 (|whatCatCategories| |name|) +; (CDR G166129)) +; (|x| NIL)) +; ((OR G166128 (ATOM G166129) +; (PROGN (SETQ |x| (CAR G166129)) NIL)) +; G166122) +; (SEQ (EXIT (SETQ G166122 +; (OR G166122 +; (|getOpDoc| (|constructor?| |x|) +; |op| |sig|))))))))))))) + +;getDocForDomain(name,op,sig) == +; getOpDoc(constructor? name,op,sig) or +; or/[getOpDoc(constructor? x,op,sig) for x in whatCatExtDom name] + +;(DEFUN |getDocForDomain| (|name| |op| |sig|) +; (PROG () +; (RETURN +; (SEQ (OR (|getOpDoc| (|constructor?| |name|) |op| |sig|) +; (PROG (G166140) +; (SPADLET G166140 NIL) +; (RETURN +; (DO ((G166146 NIL G166140) +; (G166147 (|whatCatExtDom| |name|) +; (CDR G166147)) +; (|x| NIL)) +; ((OR G166146 (ATOM G166147) +; (PROGN (SETQ |x| (CAR G166147)) NIL)) +; G166140) +; (SEQ (EXIT (SETQ G166140 +; (OR G166140 +; (|getOpDoc| (|constructor?| |x|) +; |op| |sig|))))))))))))) + +;getOpDoc(abb,op,:sigPart) == +; u := LASSOC(op,GETDATABASE(abb,'DOCUMENTATION)) +; $argList : local := $FormalMapVariableList +; _$: local := '_$ +; sigPart is [sig] => or/[d for [s,:d] in u | sig = s] +; u + +;(DEFUN |getOpDoc| (&REST G166194 &AUX |sigPart| |op| |abb|) +; (DSETQ (|abb| |op| . |sigPart|) G166194) +; (PROG (|$argList| $ |u| |sig| |s| |d|) +; (DECLARE (SPECIAL |$argList| $ |$FormalMapVariableList|)) +; (RETURN +; (SEQ (PROGN +; (SPADLET |u| +; (LASSOC |op| (GETDATABASE |abb| 'DOCUMENTATION))) +; (SPADLET |$argList| |$FormalMapVariableList|) +; (SPADLET $ '$) +; (COND +; ((AND (CONSP |sigPart|) (EQ (QCDR |sigPart|) NIL) +; (PROGN (SPADLET |sig| (QCAR |sigPart|)) 'T)) +; (PROG (G166163) +; (SPADLET G166163 NIL) +; (RETURN +; (DO ((G166171 NIL G166163) +; (G166172 |u| (CDR G166172)) +; (G166158 NIL)) +; ((OR G166171 (ATOM G166172) +; (PROGN +; (SETQ G166158 (CAR G166172)) +; NIL) +; (PROGN +; (PROGN +; (SPADLET |s| (CAR G166158)) +; (SPADLET |d| (CDR G166158)) +; G166158) +; NIL)) +; G166163) +; (SEQ (EXIT (COND +; ((BOOT-EQUAL |sig| |s|) +; (SETQ G166163 (OR G166163 |d|)))))))))) +; ('T |u|))))))) + +;readForDoc fn == +; $bootStrapMode: local:= true +; _/RQ_-LIB_-1 [fn,'SPAD] + +;(DEFUN |readForDoc| (|fn|) +; (PROG (|$bootStrapMode|) +; (DECLARE (SPECIAL |$bootStrapMode|)) +; (RETURN +; (PROGN +; (SPADLET |$bootStrapMode| 'T) +; (/RQ-LIB-1 (CONS |fn| (CONS 'SPAD NIL))))))) + +;--======================================================================= +;-- Transformation of ++ comments +;--======================================================================= +;checkExtractItemList l == --items are separated by commas or end of line +; acc := nil --l is list of remaining lines +; while l repeat --stop when you get to a line with a colon +; m := MAXINDEX first l +; k := charPosition(char '_:,first l,0) +; k <= m => return nil +; acc := [first l,:acc] +; l := rest l +; "STRCONC"/[x for x in NREVERSE acc] + +(DEFUN |checkExtractItemList| (|l|) + (PROG (|m| |k| |acc|) + (RETURN + (SEQ (PROGN + (SPADLET |acc| NIL) + (DO () ((NULL |l|) NIL) + (SEQ (EXIT (PROGN + (SPADLET |m| (MAXINDEX (CAR |l|))) + (SPADLET |k| + (|charPosition| (|char| '|:|) + (CAR |l|) 0)) + (COND + ((<= |k| |m|) (RETURN NIL)) + ('T + (SPADLET |acc| (CONS (CAR |l|) |acc|)) + (SPADLET |l| (CDR |l|)))))))) + (PROG (G166663) + (SPADLET G166663 "") + (RETURN + (DO ((G166668 (NREVERSE |acc|) (CDR G166668)) + (|x| NIL)) + ((OR (ATOM G166668) + (PROGN (SETQ |x| (CAR G166668)) NIL)) + G166663) + (SEQ (EXIT (SETQ G166663 (STRCONC G166663 |x|)))))))))))) + +;removeBackslashes s == +; s = '"" => '"" +; (k := charPosition($charBack,s,0)) < #s => +; k = 0 => removeBackslashes SUBSTRING(s,1,nil) +; STRCONC(SUBSTRING(s,0,k),removeBackslashes SUBSTRING(s,k + 1,nil)) +; s + +(DEFUN |removeBackslashes| (|s|) + (PROG (|k|) + (declare (special |$charBack|)) + (RETURN + (COND + ((BOOT-EQUAL |s| "") "") + ((> (|#| |s|) (SPADLET |k| (|charPosition| |$charBack| |s| 0))) + (COND + ((EQL |k| 0) (|removeBackslashes| (SUBSTRING |s| 1 NIL))) + ('T + (STRCONC (SUBSTRING |s| 0 |k|) + (|removeBackslashes| + (SUBSTRING |s| (PLUS |k| 1) NIL)))))) + ('T |s|))))) + +;checkNumOfArgs conform == +; conname := opOf conform +; constructor? conname or (conname := abbreviation? conname) => +; #GETDATABASE(conname,'CONSTRUCTORARGS) +; nil --signals error + +(DEFUN |checkNumOfArgs| (|conform|) + (PROG (|conname|) + (RETURN + (PROGN + (SPADLET |conname| (|opOf| |conform|)) + (COND + ((OR (|constructor?| |conname|) + (SPADLET |conname| (|abbreviation?| |conname|))) + (|#| (GETDATABASE |conname| 'CONSTRUCTORARGS))) + ('T NIL)))))) + +;checkIsValidType form == main where +;--returns ok if correct, form is wrong number of arguments, nil if unknown +; main == +; atom form => 'ok +; [op,:args] := form +; conname := (constructor? op => op; abbreviation? op) +; null conname => nil +; fn(form,GETDATABASE(conname,'COSIG)) +; fn(form,coSig) == +; #form ^= #coSig => form +; or/[null checkIsValidType x for x in rest form for flag in rest coSig | flag] +; => nil +; 'ok + +(DEFUN |checkIsValidType,fn| (|form| |coSig|) + (PROG () + (RETURN + (SEQ (IF (NEQUAL (|#| |form|) (|#| |coSig|)) (EXIT |form|)) + (IF (PROG (G166927) + (SPADLET G166927 NIL) + (RETURN + (DO ((G166935 NIL G166927) + (G166936 (CDR |form|) (CDR G166936)) + (|x| NIL) + (G166937 (CDR |coSig|) (CDR G166937)) + (|flag| NIL)) + ((OR G166935 (ATOM G166936) + (PROGN (SETQ |x| (CAR G166936)) NIL) + (ATOM G166937) + (PROGN (SETQ |flag| (CAR G166937)) NIL)) + G166927) + (SEQ (EXIT (COND + (|flag| (SETQ G166927 + (OR G166927 + (NULL + (|checkIsValidType| |x|))))))))))) + (EXIT NIL)) + (EXIT '|ok|))))) + +(DEFUN |checkIsValidType| (|form|) + (PROG (|op| |args| |conname|) + (RETURN + (COND + ((ATOM |form|) '|ok|) + ('T (SPADLET |op| (CAR |form|)) (SPADLET |args| (CDR |form|)) + (SPADLET |conname| + (COND + ((|constructor?| |op|) |op|) + ('T (|abbreviation?| |op|)))) + (COND + ((NULL |conname|) NIL) + ('T + (|checkIsValidType,fn| |form| + (GETDATABASE |conname| 'COSIG))))))))) + +;checkGetLispFunctionName s == +; n := #s +; (k := charPosition(char '_|,s,1)) and k < n and +; (j := charPosition(char '_|,s,k + 1)) and j < n => SUBSTRING(s,k + 1,j-k-1) +; checkDocError ['"Ill-formed lisp expression : ",s] +; 'illformed + +(DEFUN |checkGetLispFunctionName| (|s|) + (PROG (|n| |k| |j|) + (RETURN + (PROGN + (SPADLET |n| (|#| |s|)) + (COND + ((AND (SPADLET |k| (|charPosition| (|char| '|\||) |s| 1)) + (> |n| |k|) + (SPADLET |j| + (|charPosition| (|char| '|\||) |s| + (PLUS |k| 1))) + (> |n| |j|)) + (SUBSTRING |s| (PLUS |k| 1) + (SPADDIFFERENCE (SPADDIFFERENCE |j| |k|) 1))) + ('T + (|checkDocError| + (CONS "Ill-formed lisp expression : " + (CONS |s| NIL))) + '|illformed|)))))) + +;checkGetStringBeforeRightBrace u == +; acc := nil +; while u repeat +; x := first u +; x = $charRbrace => return "STRCONC"/(NREVERSE acc) +; acc := [x,:acc] +; u := rest u + +(DEFUN |checkGetStringBeforeRightBrace| (|u|) + (PROG (|x| |acc|) + (declare (special |$charRbrace|)) + (RETURN + (SEQ (PROGN + (SPADLET |acc| NIL) + (DO () ((NULL |u|) NIL) + (SEQ (EXIT (PROGN + (SPADLET |x| (CAR |u|)) + (COND + ((BOOT-EQUAL |x| |$charRbrace|) + (RETURN + (PROG (G166979) + (SPADLET G166979 "") + (RETURN + (DO + ((G166984 (NREVERSE |acc|) + (CDR G166984)) + (G166968 NIL)) + ((OR (ATOM G166984) + (PROGN + (SETQ G166968 + (CAR G166984)) + NIL)) + G166979) + (SEQ + (EXIT + (SETQ G166979 + (STRCONC G166979 G166968))))))))) + ('T (SPADLET |acc| (CONS |x| |acc|)) + (SPADLET |u| (CDR |u|))))))))))))) + +;-- checkTranVerbatim u == +;-- acc := nil +;-- while u repeat +;-- x := first u +;-- x = '"\begin" and checkTranVerbatimMiddle u is [middle,:r] => +;-- acc := [$charRbrace,:middle,$charLbrace,'"\spadpaste",:acc] +;-- u := r +;-- if x = '"\spadcommand" then x := '"\spadpaste" +;-- acc := [x,:acc] +;-- u := rest u +;-- NREVERSE acc +;-- +;-- checkTranVerbatimMiddle u == +;-- (y := IFCAR (v := IFCDR u)) = $charLbrace and +;-- (y := IFCAR (v := IFCDR v)) = '"verbatim" and +;-- (y := IFCAR (v := IFCDR v)) = $charRbrace => +;-- w := IFCDR v +;-- middle := nil +;-- while w and (z := first w) ^= '"\end" repeat +;-- middle := [z,:middle] +;-- w := rest w +;-- if (y := IFCAR (w := IFCDR w)) = $charLbrace and +;-- (y := IFCAR (w := IFCDR w)) = '"verbatim" and +;-- (y := IFCAR (w := IFCDR w)) = $charRbrace then +;-- u := IFCDR w +;-- else +;-- checkDocError '"Missing \end{verbatim}" +;-- u := w +;-- [middle,:u] +;-- +;-- checkTranVerbatim1 u == +;-- acc := nil +;-- while u repeat +;-- x := first u +;-- x = '"\begin" and (y := IFCAR (v := IFCDR u)) = $charLbrace and +;-- (y := IFCAR (v := IFCDR v)) = '"verbatim" and +;-- (y := IFCAR (v := IFCDR v)) = $charRbrace => +;-- w := IFCDR v +;-- middle := nil +;-- while w and (z := first w) ^= '"\end" repeat +;-- middle := [z,:middle] +;-- w := rest w +;-- if (y := IFCAR (w := IFCDR w)) = $charLbrace and +;-- (y := IFCAR (w := IFCDR w)) = '"verbatim" and +;-- (y := IFCAR (w := IFCDR w)) = $charRbrace then +;-- u := IFCDR w +;-- acc := [$charRbrace,:middle,$charLbrace,'"\spadpaste",:acc] +;-- if x = '"\spadcommand" then x := '"\spadpaste" +;-- acc := [x,:acc] +;-- u := rest u +;-- NREVERSE acc +;appendOver [head,:tail] == +; acc := LASTNODE head +; for x in tail repeat +; end := LASTNODE x +; RPLACD(acc,x) +; acc := end +; head + +(DEFUN |appendOver| (G167000) + (PROG (|head| |tail| |end| |acc|) + (RETURN + (SEQ (PROGN + (SPADLET |head| (CAR G167000)) + (SPADLET |tail| (CDR G167000)) + (SPADLET |acc| (LASTNODE |head|)) + (DO ((G167015 |tail| (CDR G167015)) (|x| NIL)) + ((OR (ATOM G167015) + (PROGN (SETQ |x| (CAR G167015)) NIL)) + NIL) + (SEQ (EXIT (PROGN + (SPADLET |end| (LASTNODE |x|)) + (RPLACD |acc| |x|) + (SPADLET |acc| |end|))))) + |head|))))) + +;checkRemoveComments lines == +; while lines repeat +; do +; line := checkTrimCommented first lines +; if firstNonBlankPosition line >= 0 then acc := [line,:acc] +; lines := rest lines +; NREVERSE acc + +(DEFUN |checkRemoveComments| (|lines|) + (PROG (|line| |acc|) + (RETURN + (SEQ (PROGN + (DO () ((NULL |lines|) NIL) + (SEQ (EXIT (PROGN + (|do| (PROGN + (SPADLET |line| + (|checkTrimCommented| + (CAR |lines|))) + (COND + ((>= + (|firstNonBlankPosition| + |line|) + 0) + (SPADLET |acc| + (CONS |line| |acc|))) + ('T NIL)))) + (SPADLET |lines| (CDR |lines|)))))) + (NREVERSE |acc|)))))) + +;checkTrimCommented line == +; n := #line +; k := htcharPosition(char '_%,line,0) +; --line beginning with % is a comment +; k = 0 => '"" +; --remarks beginning with %% are comments +; k >= n - 1 or line.(k + 1) ^= char '_% => line +; k < #line => SUBSTRING(line,0,k) +; line + +(DEFUN |checkTrimCommented| (|line|) + (PROG (|n| |k|) + (RETURN + (PROGN + (SPADLET |n| (|#| |line|)) + (SPADLET |k| (|htcharPosition| (|char| '%) |line| 0)) + (COND + ((EQL |k| 0) "") + ((OR (>= |k| (SPADDIFFERENCE |n| 1)) + (NEQUAL (ELT |line| (PLUS |k| 1)) (|char| '%))) + |line|) + ((> (|#| |line|) |k|) (SUBSTRING |line| 0 |k|)) + ('T |line|)))))) + +;htcharPosition(char,line,i) == +; m := #line +; k := charPosition(char,line,i) +; k = m => k +; k > 0 => +; line.(k - 1) ^= $charBack => k +; htcharPosition(char,line,k + 1) +; 0 + +(DEFUN |htcharPosition| (|char| |line| |i|) + (PROG (|m| |k|) + (declare (special |$charBack|)) + (RETURN + (PROGN + (SPADLET |m| (|#| |line|)) + (SPADLET |k| (|charPosition| |char| |line| |i|)) + (COND + ((BOOT-EQUAL |k| |m|) |k|) + ((> |k| 0) + (COND + ((NEQUAL (ELT |line| (SPADDIFFERENCE |k| 1)) |$charBack|) + |k|) + ('T (|htcharPosition| |char| |line| (PLUS |k| 1))))) + ('T 0)))))) + +;checkAddMacros u == +; acc := nil +; verbatim := false +; while u repeat +; x := first u +; acc := +; x = '"\end{verbatim}" => +; verbatim := false +; [x, :acc] +; verbatim => [x, :acc] +; x = '"\begin{verbatim}" => +; verbatim := true +; [x, :acc] +; y := LASSOC(x,$HTmacs) => [:y,:acc] +; [x,:acc] +; u := rest u +; NREVERSE acc + +(DEFUN |checkAddMacros| (|u|) + (PROG (|x| |verbatim| |y| |acc|) + (declare (special |$HTmacs|)) + (RETURN + (SEQ (PROGN + (SPADLET |acc| NIL) + (SPADLET |verbatim| NIL) + (DO () ((NULL |u|) NIL) + (SEQ (EXIT (PROGN + (SPADLET |x| (CAR |u|)) + (SPADLET |acc| + (COND + ((BOOT-EQUAL |x| + "\\end{verbatim}") + (SPADLET |verbatim| NIL) + (CONS |x| |acc|)) + (|verbatim| (CONS |x| |acc|)) + ((BOOT-EQUAL |x| + "\\begin{verbatim}") + (SPADLET |verbatim| 'T) + (CONS |x| |acc|)) + ((SPADLET |y| + (LASSOC |x| |$HTmacs|)) + (APPEND |y| |acc|)) + ('T (CONS |x| |acc|)))) + (SPADLET |u| (CDR |u|)))))) + (NREVERSE |acc|)))))) + +;checkIndentedLines(u, margin) == +; verbatim := false +; u2 := nil +; for x in u repeat +; k := firstNonBlankPosition x +; k = -1 => +; verbatim => u2 := [:u2, $charFauxNewline] +; u2 := [:u2, '"\blankline "] +; s := SUBSTRING(x, k, nil) +; s = '"\begin{verbatim}" => +; verbatim := true +; u2 := [:u2, s] +; s = '"\end{verbatim}" => +; verbatim := false +; u2 := [:u2, s] +; verbatim => u2 := [:u2, SUBSTRING(x, margin, nil)] +; margin = k => u2 := [:u2, s] +; u2 := [:u2, STRCONC('"\indented{",STRINGIMAGE(k-margin),'"}{",checkAddSpaceSegments(s,0),'"}")] +; u2 + +(DEFUN |checkIndentedLines| (|u| |margin|) + (PROG (|k| |s| |verbatim| |u2|) + (declare (special |$charFauxNewline|)) + (RETURN + (SEQ (PROGN + (SPADLET |verbatim| NIL) + (SPADLET |u2| NIL) + (DO ((G167153 |u| (CDR G167153)) (|x| NIL)) + ((OR (ATOM G167153) + (PROGN (SETQ |x| (CAR G167153)) NIL)) + NIL) + (SEQ (EXIT (PROGN + (SPADLET |k| (|firstNonBlankPosition| |x|)) + (COND + ((BOOT-EQUAL |k| (SPADDIFFERENCE 1)) + (COND + (|verbatim| + (SPADLET |u2| + (APPEND |u2| + (CONS |$charFauxNewline| NIL)))) + ('T + (SPADLET |u2| + (APPEND |u2| + (CONS + "\\blankline " + NIL)))))) + ('T (SPADLET |s| (SUBSTRING |x| |k| NIL)) + (COND + ((BOOT-EQUAL |s| + "\\begin{verbatim}") + (SPADLET |verbatim| 'T) + (SPADLET |u2| + (APPEND |u2| (CONS |s| NIL)))) + ((BOOT-EQUAL |s| + "\\end{verbatim}") + (SPADLET |verbatim| NIL) + (SPADLET |u2| + (APPEND |u2| (CONS |s| NIL)))) + (|verbatim| + (SPADLET |u2| + (APPEND |u2| + (CONS + (SUBSTRING |x| |margin| NIL) + NIL)))) + ((BOOT-EQUAL |margin| |k|) + (SPADLET |u2| + (APPEND |u2| (CONS |s| NIL)))) + ('T + (SPADLET |u2| + (APPEND |u2| + (CONS + (STRCONC + "\\indented{" + (STRINGIMAGE + (SPADDIFFERENCE |k| + |margin|)) + "}{" + (|checkAddSpaceSegments| + |s| 0) + "}") + NIL))))))))))) + |u2|))))) + +;newString2Words l == +; not STRINGP l => [l] +; m := MAXINDEX l +; m = -1 => NIL +; i := 0 +; [w while newWordFrom(l,i,m) is [w,i]] + +(DEFUN |newString2Words| (|l|) + (PROG (|m| |ISTMP#1| |w| |ISTMP#2| |i|) + (RETURN + (SEQ (COND + ((NULL (STRINGP |l|)) (CONS |l| NIL)) + ('T (SPADLET |m| (MAXINDEX |l|)) + (COND + ((BOOT-EQUAL |m| (SPADDIFFERENCE 1)) NIL) + ('T (SPADLET |i| 0) + (PROG (G167196) + (SPADLET G167196 NIL) + (RETURN + (DO () + ((NULL (PROGN + (SPADLET |ISTMP#1| + (|newWordFrom| |l| |i| |m|)) + (AND (CONSP |ISTMP#1|) + (PROGN + (SPADLET |w| (QCAR |ISTMP#1|)) + (SPADLET |ISTMP#2| + (QCDR |ISTMP#1|)) + (AND (CONSP |ISTMP#2|) + (EQ (QCDR |ISTMP#2|) NIL) + (PROGN + (SPADLET |i| + (QCAR |ISTMP#2|)) + 'T)))))) + (NREVERSE0 G167196)) + (SEQ (EXIT (SETQ G167196 (CONS |w| G167196))))))))))))))) + +;newWordFrom(l,i,m) == +; while i <= m and l.i = " " repeat i := i + 1 +; i > m => NIL +; buf := '"" +; ch := l.i +; ch = $charFauxNewline => [$stringFauxNewline, i+ 1] +; done := false +; while i <= m and not done repeat +; ch := l.i +; ch = $charBlank or ch = $charFauxNewline => done := true +; buf := STRCONC(buf,ch) +; i := i + 1 +; [buf,i] + +(DEFUN |newWordFrom| (|l| |i| |m|) + (PROG (|ch| |done| |buf|) + (declare (special |$charFauxNewline| |$charBlank| |$stringFauxNewline|)) + (RETURN + (SEQ (PROGN + (DO () + ((NULL (AND (<= |i| |m|) + (BOOT-EQUAL (ELT |l| |i|) '| |))) + NIL) + (SEQ (EXIT (SPADLET |i| (PLUS |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))) + ('T (SPADLET |done| NIL) + (DO () ((NULL (AND (<= |i| |m|) (NULL |done|))) NIL) + (SEQ (EXIT (PROGN + (SPADLET |ch| (ELT |l| |i|)) + (COND + ((OR (BOOT-EQUAL |ch| |$charBlank|) + (BOOT-EQUAL |ch| + |$charFauxNewline|)) + (SPADLET |done| 'T)) + ('T + (SPADLET |buf| + (STRCONC |buf| |ch|)) + (SPADLET |i| (PLUS |i| 1)))))))) + (CONS |buf| (CONS |i| NIL))))))))))) + +;checkGetArgs u == +; NOT STRINGP u => nil +; m := MAXINDEX u +; k := firstNonBlankPosition(u) +; k > 0 => checkGetArgs SUBSTRING(u,k,nil) +; stringPrefix?('"\spad{",u) => +; k := getMatchingRightPren(u,6,char '_{,char '_}) or m +; checkGetArgs SUBSTRING(u,6,k-6) +; (i := charPosition(char '_(,u,0)) > m => nil +; (u . m) ^= char '_) => nil +; while (k := charPosition($charComma,u,i + 1)) < m repeat +; acc := [trimString SUBSTRING(u,i + 1,k - i - 1),:acc] +; i := k +; NREVERSE [SUBSTRING(u,i + 1,m - i - 1),:acc] + +(DEFUN |checkGetArgs| (|u|) + (PROG (|m| |k| |acc| |i|) + (declare (special |$charComma|)) + (RETURN + (SEQ (COND + ((NULL (STRINGP |u|)) NIL) + ('T (SPADLET |m| (MAXINDEX |u|)) + (SPADLET |k| (|firstNonBlankPosition| |u|)) + (COND + ((> |k| 0) (|checkGetArgs| (SUBSTRING |u| |k| NIL))) + ((|stringPrefix?| "\\spad{" |u|) + (SPADLET |k| + (OR (|getMatchingRightPren| |u| 6 (|char| '{) + (|char| '})) + |m|)) + (|checkGetArgs| + (SUBSTRING |u| 6 (SPADDIFFERENCE |k| 6)))) + ((> (SPADLET |i| (|charPosition| (|char| '|(|) |u| 0)) + |m|) + NIL) + ((NEQUAL (ELT |u| |m|) (|char| '|)|)) NIL) + ('T + (DO () + ((NULL (> |m| + (SPADLET |k| + (|charPosition| |$charComma| + |u| (PLUS |i| 1))))) + NIL) + (SEQ (EXIT (PROGN + (SPADLET |acc| + (CONS + (|trimString| + (SUBSTRING |u| (PLUS |i| 1) + (SPADDIFFERENCE + (SPADDIFFERENCE |k| |i|) + 1))) + |acc|)) + (SPADLET |i| |k|))))) + (NREVERSE + (CONS (SUBSTRING |u| (PLUS |i| 1) + (SPADDIFFERENCE (SPADDIFFERENCE |m| |i|) + 1)) + |acc|)))))))))) + +;checkAddIndented(x,margin) == +; k := firstNonBlankPosition x +; k = -1 => '"\blankline " +; margin = k => x +; STRCONC('"\indented{",STRINGIMAGE(k-margin),'"}{",checkAddSpaceSegments(SUBSTRING(x,k,nil),0),'"}") + +(DEFUN |checkAddIndented| (|x| |margin|) + (PROG (|k|) + (RETURN + (PROGN + (SPADLET |k| (|firstNonBlankPosition| |x|)) + (COND + ((BOOT-EQUAL |k| (SPADDIFFERENCE 1)) + "\\blankline ") + ((BOOT-EQUAL |margin| |k|) |x|) + ('T + (STRCONC "\\indented{" + (STRINGIMAGE (SPADDIFFERENCE |k| |margin|)) + "}{" + (|checkAddSpaceSegments| (SUBSTRING |x| |k| NIL) 0) + "}"))))))) + +;checkAddSpaceSegments(u,k) == +; m := MAXINDEX u +; i := charPosition($charBlank,u,k) +; m < i => u +; j := i +; while (j := j + 1) < m and u.j = (char '_ ) repeat 'continue +; n := j - i --number of blanks +; n > 1 => STRCONC(SUBSTRING(u,0,i),'"\space{", +; STRINGIMAGE n,'"}",checkAddSpaceSegments(SUBSTRING(u,i + n,nil),0)) +; checkAddSpaceSegments(u,j) + +(DEFUN |checkAddSpaceSegments| (|u| |k|) + (PROG (|m| |i| |j| |n|) + (declare (special |$charBlank|)) + (RETURN + (SEQ (PROGN + (SPADLET |m| (MAXINDEX |u|)) + (SPADLET |i| (|charPosition| |$charBlank| |u| |k|)) + (COND + ((> |i| |m|) |u|) + ('T (SPADLET |j| |i|) + (DO () + ((NULL (AND (> |m| (SPADLET |j| (PLUS |j| 1))) + (BOOT-EQUAL (ELT |u| |j|) + (|char| '| |)))) + NIL) + (SEQ (EXIT '|continue|))) + (SPADLET |n| (SPADDIFFERENCE |j| |i|)) + (COND + ((> |n| 1) + (STRCONC (SUBSTRING |u| 0 |i|) + "\\space{" (STRINGIMAGE |n|) + "}" + (|checkAddSpaceSegments| + (SUBSTRING |u| (PLUS |i| |n|) NIL) 0))) + ('T (|checkAddSpaceSegments| |u| |j|)))))))))) + +;checkTrim($x,lines) == main where +; main == +; s := [wherePP first lines] +; for x in rest lines repeat +; j := wherePP x +; if not MEMQ(j,s) then +; checkDocError [$x,'" has varying indentation levels"] +; s := [j,:s] +; [trim y for y in lines] +; wherePP(u) == +; k := charPosition($charPlus,u,0) +; k = #u or charPosition($charPlus,u,k + 1) ^= k + 1 => +; systemError '" Improper comment found" +; k +; trim(s) == +; k := wherePP(s) +; return SUBSTRING(s,k + 2,nil) +; m := MAXINDEX s +; n := k + 2 +; for j in (k + 2)..m while s.j = $charBlank repeat (n := n + 1) +; SUBSTRING(s,n,nil) + +(DEFUN |checkTrim,trim| (|s|) + (PROG (|k| |m| |n|) + (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))) + ((OR (> |j| |m|) + (NULL (BOOT-EQUAL (ELT |s| |j|) |$charBlank|))) + NIL) + (SEQ (EXIT (SPADLET |n| (PLUS |n| 1))))) + (EXIT (SUBSTRING |s| |n| NIL)))))) + +(DEFUN |checkTrim,wherePP| (|u|) + (PROG (|k|) + (declare (special |$charPlus|)) + (RETURN + (SEQ (SPADLET |k| (|charPosition| |$charPlus| |u| 0)) + (IF (OR (BOOT-EQUAL |k| (|#| |u|)) + (NEQUAL (|charPosition| |$charPlus| |u| + (PLUS |k| 1)) + (PLUS |k| 1))) + (EXIT (|systemError| + " Improper comment found"))) + (EXIT |k|))))) + +(DEFUN |checkTrim| (|$x| |lines|) + (DECLARE (SPECIAL |$x|)) + (PROG (|j| |s|) + (RETURN + (SEQ (PROGN + (SPADLET |s| + (CONS (|checkTrim,wherePP| (CAR |lines|)) NIL)) + (DO ((G167356 (CDR |lines|) (CDR G167356)) (|x| NIL)) + ((OR (ATOM G167356) + (PROGN (SETQ |x| (CAR G167356)) NIL)) + NIL) + (SEQ (EXIT (PROGN + (SPADLET |j| (|checkTrim,wherePP| |x|)) + (COND + ((NULL (member |j| |s|)) + (|checkDocError| + (CONS |$x| + (CONS + " has varying indentation levels" + NIL))) + (SPADLET |s| (CONS |j| |s|))) + ('T NIL)))))) + (PROG (G167366) + (SPADLET G167366 NIL) + (RETURN + (DO ((G167371 |lines| (CDR G167371)) (|y| NIL)) + ((OR (ATOM G167371) + (PROGN (SETQ |y| (CAR G167371)) NIL)) + (NREVERSE0 G167366)) + (SEQ (EXIT (SETQ G167366 + (CONS (|checkTrim,trim| |y|) + G167366)))))))))))) + +;checkExtract(header,lines) == +; while lines repeat +; line := first lines +; k := firstNonBlankPosition line --k gives margin of Description: +; substring?(header,line,k) => return nil +; lines := rest lines +; null lines => nil +; u := first lines +; j := charPosition(char '_:,u,k) +; margin := k +; firstLines := +; (k := firstNonBlankPosition(u,j + 1)) ^= -1 => +; [SUBSTRING(u,j + 1,nil),:rest lines] +; rest lines +; --now look for another header; if found skip all rest of these lines +; acc := nil +; for line in firstLines repeat +; do +; m := #line +; (k := firstNonBlankPosition line) = -1 => 'skip --include if blank +; k > margin => 'skip --include if idented +; not UPPER_-CASE_-P line.k => 'skip --also if not upcased +; (j := charPosition(char '_:,line,k)) = m => 'skip --or if not colon, or +; (i := charPosition(char '_ ,line,k+1)) < j => 'skip --blank before colon +; return nil +; acc := [line,:acc] +; NREVERSE acc + +(DEFUN |checkExtract| (|header| |lines|) + (PROG (|line| |u| |margin| |firstLines| |m| |k| |j| |i| |acc|) + (RETURN + (SEQ (PROGN + (DO () ((NULL |lines|) NIL) + (SEQ (EXIT (PROGN + (SPADLET |line| (CAR |lines|)) + (SPADLET |k| + (|firstNonBlankPosition| |line|)) + (COND + ((|substring?| |header| |line| |k|) + (RETURN NIL)) + ('T (SPADLET |lines| (CDR |lines|)))))))) + (COND + ((NULL |lines|) NIL) + ('T (SPADLET |u| (CAR |lines|)) + (SPADLET |j| (|charPosition| (|char| '|:|) |u| |k|)) + (SPADLET |margin| |k|) + (SPADLET |firstLines| + (COND + ((NEQUAL (SPADLET |k| + (|firstNonBlankPosition| |u| + (PLUS |j| 1))) + (SPADDIFFERENCE 1)) + (CONS (SUBSTRING |u| (PLUS |j| 1) NIL) + (CDR |lines|))) + ('T (CDR |lines|)))) + (SPADLET |acc| NIL) + (DO ((G167406 |firstLines| (CDR G167406)) + (|line| NIL)) + ((OR (ATOM G167406) + (PROGN (SETQ |line| (CAR G167406)) NIL)) + NIL) + (SEQ (EXIT (PROGN + (|do| (PROGN + (SPADLET |m| (|#| |line|)) + (COND + ((BOOT-EQUAL + (SPADLET |k| + (|firstNonBlankPosition| + |line|)) + (SPADDIFFERENCE 1)) + '|skip|) + ((> |k| |margin|) '|skip|) + ((NULL + (UPPER-CASE-P + (ELT |line| |k|))) + '|skip|) + ((BOOT-EQUAL + (SPADLET |j| + (|charPosition| + (|char| '|:|) |line| |k|)) + |m|) + '|skip|) + ((> |j| + (SPADLET |i| + (|charPosition| + (|char| '| |) |line| + (PLUS |k| 1)))) + '|skip|) + ('T (RETURN NIL))))) + (SPADLET |acc| (CONS |line| |acc|)))))) + (NREVERSE |acc|)))))))) + +;checkFixCommonProblem u == +; acc := nil +; while u repeat +; x := first u +; x = $charLbrace and MEMBER(next := IFCAR rest u,$HTspadmacros) and +; (IFCAR IFCDR rest u ^= $charLbrace) => +; checkDocError ['"Reversing ",next,'" and left brace"] +; acc := [$charLbrace,next,:acc] --reverse order of brace and command +; u := rest rest u +; acc := [x,:acc] +; u := rest u +; NREVERSE acc + +(DEFUN |checkFixCommonProblem| (|u|) + (PROG (|x| |next| |acc|) + (declare (special |$charLbrace| |$HTspadmacros|)) + (RETURN + (SEQ (PROGN + (SPADLET |acc| NIL) + (DO () ((NULL |u|) NIL) + (SEQ (EXIT (PROGN + (SPADLET |x| (CAR |u|)) + (COND + ((AND (BOOT-EQUAL |x| |$charLbrace|) + (|member| + (SPADLET |next| (IFCAR (CDR |u|))) + |$HTspadmacros|) + (NEQUAL (IFCAR (IFCDR (CDR |u|))) + |$charLbrace|)) + (|checkDocError| + (CONS "Reversing " + (CONS |next| + (CONS + " and left brace" + NIL)))) + (SPADLET |acc| + (CONS |$charLbrace| + (CONS |next| |acc|))) + (SPADLET |u| (CDR (CDR |u|)))) + ('T (SPADLET |acc| (CONS |x| |acc|)) + (SPADLET |u| (CDR |u|)))))))) + (NREVERSE |acc|)))))) + +;checkDecorate u == +; count := 0 +; spadflag := false --means OK to wrap single letter words with \s{} +; mathSymbolsOk := false +; acc := nil +; verbatim := false +; while u repeat +; x := first u +; if not verbatim then +; if x = '"\em" then +; if count > 0 then +; mathSymbolsOk := count - 1 +; spadflag := count - 1 +; else checkDocError ['"\em must be enclosed in braces"] +; if MEMBER(x,'("\spadpaste" "\spad" "\spadop")) then mathSymbolsOk := count +; if MEMBER(x,'("\s" "\spadtype" "\spadsys" "\example" "\andexample" "\spadop" "\spad" "\spadignore" "\spadpaste" "\spadcommand" "\footnote")) then spadflag := count +; else if x = $charLbrace then +; count := count + 1 +; else if x = $charRbrace then +; count := count - 1 +; if mathSymbolsOk = count then mathSymbolsOk := false +; if spadflag = count then spadflag := false +; else if not mathSymbolsOk and MEMBER(x,'("+" "*" "=" "==" "->")) then +; if $checkingXmptex? then +; checkDocError ["Symbol ",x,'" appearing outside \spad{}"] +; acc := +; x = '"\end{verbatim}" => +; verbatim := false +; [x, :acc] +; verbatim => [x, :acc] +; x = '"\begin{verbatim}" => +; verbatim := true +; [x, :acc] +; x = '"\begin" and first (v := IFCDR u) = $charLbrace and +; first (v := IFCDR v) = '"detail" and first (v := IFCDR v) = $charRbrace +; => +; u := v +; ['"\blankline ",:acc] +; x = '"\end" and first (v := IFCDR u) = $charLbrace and +; first (v := IFCDR v) = '"detail" and first (v := IFCDR v) = $charRbrace +; => +; u := v +; acc +; x = char '_$ or x = '"$" => ['"\$",:acc] +; x = char '_% or x = '"%" => ['"\%",:acc] +; x = char '_, or x = '"," => ['",{}",:acc] +; x = '"\spad" => ['"\spad",:acc] +; STRINGP x and DIGITP x.0 => [x,:acc] +; null spadflag and +; (CHARP x and ALPHA_-CHAR_-P x and not MEMQ(x,$charExclusions) or +; MEMBER(x,$argl)) => [$charRbrace,x,$charLbrace,'"\spad",:acc] +; null spadflag and ((STRINGP x and not x.0 = $charBack and DIGITP(x.(MAXINDEX x))) or MEMBER(x,'("true" "false"))) => +; [$charRbrace,x,$charLbrace,'"\spad",:acc] --wrap x1, alpha3, etc +; xcount := #x +; xcount = 3 and x.1 = char 't and x.2 = char 'h => +; ['"th",$charRbrace,x.0,$charLbrace,'"\spad",:acc] +; xcount = 4 and x.1 = char '_- and x.2 = char 't and x.3 = char 'h => +; ['"-th",$charRbrace,x.0,$charLbrace,'"\spad",:acc] +; xcount = 2 and x.1 = char 'i or --wrap ei, xi, hi +; null spadflag and xcount > 0 and xcount < 4 and not MEMBER(x,'("th" "rd" "st")) and +; hasNoVowels x => --wrap words with no vowels +; [$charRbrace,x,$charLbrace,'"\spad",:acc] +; [checkAddBackSlashes x,:acc] +; u := rest u +; NREVERSE acc + +(DEFUN |checkDecorate| (|u|) + (PROG (|x| |count| |mathSymbolsOk| |spadflag| |verbatim| |v| |xcount| |acc|) + (declare (special |$charLbrace| |$charRbrace| |$charBack| |$argl| + |$charExclusions| |$checkingXmptex?|)) + (RETURN + (SEQ (PROGN + (SPADLET |count| 0) + (SPADLET |spadflag| NIL) + (SPADLET |mathSymbolsOk| NIL) + (SPADLET |acc| NIL) + (SPADLET |verbatim| NIL) + (DO () ((NULL |u|) NIL) + (SEQ (EXIT (PROGN + (SPADLET |x| (CAR |u|)) + (COND + ((NULL |verbatim|) + (COND + ((BOOT-EQUAL |x| "\\em") + (COND + ((> |count| 0) + (SPADLET |mathSymbolsOk| + (SPADDIFFERENCE |count| 1)) + (SPADLET |spadflag| + (SPADDIFFERENCE |count| 1))) + ('T + (|checkDocError| + (CONS + "\\em must be enclosed in braces" + NIL)))))) + (COND + ((|member| |x| + '("\\spadpaste" "\\spad" + "\\spadop")) + (SPADLET |mathSymbolsOk| |count|))) + (COND + ((|member| |x| + '("\\s" "\\spadtype" "\\spadsys" + "\\example" "\\andexample" + "\\spadop" "\\spad" + "\\spadignore" "\\spadpaste" + "\\spadcommand" "\\footnote")) + (SPADLET |spadflag| |count|)) + ((BOOT-EQUAL |x| |$charLbrace|) + (SPADLET |count| (PLUS |count| 1))) + ((BOOT-EQUAL |x| |$charRbrace|) + (SPADLET |count| + (SPADDIFFERENCE |count| 1)) + (COND + ((BOOT-EQUAL |mathSymbolsOk| + |count|) + (SPADLET |mathSymbolsOk| NIL))) + (COND + ((BOOT-EQUAL |spadflag| |count|) + (SPADLET |spadflag| NIL)) + ('T NIL))) + ((AND (NULL |mathSymbolsOk|) + (|member| |x| + '("+" "*" "=" "==" "->"))) + (COND + (|$checkingXmptex?| + (|checkDocError| + (CONS '|Symbol | + (CONS |x| + (CONS + " appearing outside \\spad{}" + NIL))))) + ('T NIL))) + ('T NIL)))) + (SPADLET |acc| + (COND + ((BOOT-EQUAL |x| + "\\end{verbatim}") + (SPADLET |verbatim| NIL) + (CONS |x| |acc|)) + (|verbatim| (CONS |x| |acc|)) + ((BOOT-EQUAL |x| + "\\begin{verbatim}") + (SPADLET |verbatim| 'T) + (CONS |x| |acc|)) + ((AND + (BOOT-EQUAL |x| + "\\begin") + (BOOT-EQUAL + (CAR + (SPADLET |v| (IFCDR |u|))) + |$charLbrace|) + (BOOT-EQUAL + (CAR + (SPADLET |v| (IFCDR |v|))) + "detail") + (BOOT-EQUAL + (CAR + (SPADLET |v| (IFCDR |v|))) + |$charRbrace|)) + (SPADLET |u| |v|) + (CONS + "\\blankline " + |acc|)) + ((AND + (BOOT-EQUAL |x| + "\\end") + (BOOT-EQUAL + (CAR + (SPADLET |v| (IFCDR |u|))) + |$charLbrace|) + (BOOT-EQUAL + (CAR + (SPADLET |v| (IFCDR |v|))) + "detail") + (BOOT-EQUAL + (CAR + (SPADLET |v| (IFCDR |v|))) + |$charRbrace|)) + (SPADLET |u| |v|) |acc|) + ((OR + (BOOT-EQUAL |x| (|char| '$)) + (BOOT-EQUAL |x| + "$")) + (CONS "\\$" |acc|)) + ((OR + (BOOT-EQUAL |x| (|char| '%)) + (BOOT-EQUAL |x| + "%")) + (CONS "\\%" |acc|)) + ((OR + (BOOT-EQUAL |x| (|char| '|,|)) + (BOOT-EQUAL |x| + ",")) + (CONS ",{}" |acc|)) + ((BOOT-EQUAL |x| + "\\spad") + (CONS "\\spad" + |acc|)) + ((AND (STRINGP |x|) + (DIGITP (ELT |x| 0))) + (CONS |x| |acc|)) + ((AND (NULL |spadflag|) + (OR + (AND (CHARP |x|) + (ALPHA-CHAR-P |x|) + (NULL + (member |x| + |$charExclusions|))) + (|member| |x| |$argl|))) + (CONS |$charRbrace| + (CONS |x| + (CONS |$charLbrace| + (CONS "\\spad" + |acc|))))) + ((AND (NULL |spadflag|) + (OR + (AND (STRINGP |x|) + (NULL + (BOOT-EQUAL (ELT |x| 0) + |$charBack|)) + (DIGITP + (ELT |x| (MAXINDEX |x|)))) + (|member| |x| + '("true" "false")))) + (CONS |$charRbrace| + (CONS |x| + (CONS |$charLbrace| + (CONS "\\spad" + |acc|))))) + ('T (SPADLET |xcount| (|#| |x|)) + (COND + ((AND (EQL |xcount| 3) + (BOOT-EQUAL (ELT |x| 1) + (|char| '|t|)) + (BOOT-EQUAL (ELT |x| 2) + (|char| '|h|))) + (CONS "th" + (CONS |$charRbrace| + (CONS (ELT |x| 0) + (CONS |$charLbrace| + (CONS + "\\spad" + |acc|)))))) + ((AND (EQL |xcount| 4) + (BOOT-EQUAL (ELT |x| 1) + (|char| '-)) + (BOOT-EQUAL (ELT |x| 2) + (|char| '|t|)) + (BOOT-EQUAL (ELT |x| 3) + (|char| '|h|))) + (CONS "-th" + (CONS |$charRbrace| + (CONS (ELT |x| 0) + (CONS |$charLbrace| + (CONS + "\\spad" + |acc|)))))) + ((OR + (AND (EQL |xcount| 2) + (BOOT-EQUAL (ELT |x| 1) + (|char| '|i|))) + (AND (NULL |spadflag|) + (> |xcount| 0) + (> 4 |xcount|) + (NULL + (|member| |x| + '("th" "rd" "st"))) + (|hasNoVowels| |x|))) + (CONS |$charRbrace| + (CONS |x| + (CONS |$charLbrace| + (CONS + "\\spad" + |acc|))))) + ('T + (CONS + (|checkAddBackSlashes| |x|) + |acc|)))))) + (SPADLET |u| (CDR |u|)))))) + (NREVERSE |acc|)))))) + +;hasNoVowels x == +; max := MAXINDEX x +; x.max = char 'y => false +; and/[not isVowel(x.i) for i in 0..max] + +(DEFUN |hasNoVowels| (|x|) + (PROG (|max|) + (RETURN + (SEQ (PROGN + (SPADLET |max| (MAXINDEX |x|)) + (COND + ((BOOT-EQUAL (ELT |x| |max|) (|char| '|y|)) NIL) + ('T + (PROG (G167501) + (SPADLET G167501 'T) + (RETURN + (DO ((G167507 NIL (NULL G167501)) + (|i| 0 (QSADD1 |i|))) + ((OR G167507 (QSGREATERP |i| |max|)) + G167501) + (SEQ (EXIT (SETQ G167501 + (AND G167501 + (NULL + (|isVowel| (ELT |x| |i|))))))))))))))))) + +;isVowel c == +; EQ(c,char 'a) or EQ(c,char 'e) or EQ(c,char 'i) or EQ(c,char 'o) or EQ(c,char 'u) or +; EQ(c,char 'A) or EQ(c,char 'E) or EQ(c,char 'I) or EQ(c,char 'O) or EQ(c,char 'U) + +(DEFUN |isVowel| (|c|) + (OR (EQ |c| (|char| '|a|)) (EQ |c| (|char| '|e|)) + (EQ |c| (|char| '|i|)) (EQ |c| (|char| '|o|)) + (EQ |c| (|char| '|u|)) (EQ |c| (|char| 'A)) (EQ |c| (|char| 'E)) + (EQ |c| (|char| 'I)) (EQ |c| (|char| 'O)) (EQ |c| (|char| 'U)))) + +;checkAddBackSlashes s == +; (CHARP s and (c := s)) or (#s = 1 and (c := s.0)) => +; MEMQ(s,$charEscapeList) => STRCONC($charBack,c) +; s +; k := 0 +; m := MAXINDEX s +; insertIndex := nil +; while k <= m repeat +; do +; char := s.k +; char = $charBack => k := k + 2 +; MEMQ(char,$charEscapeList) => return (insertIndex := k) +; k := k + 1 +; insertIndex => checkAddBackSlashes STRCONC(SUBSTRING(s,0,insertIndex),$charBack,s.k,SUBSTRING(s,insertIndex + 1,nil)) +; s + +(DEFUN |checkAddBackSlashes| (|s|) + (PROG (|c| |m| |char| |insertIndex| |k|) + (declare (special |$charBack| |$charEscapeList|)) + (RETURN + (SEQ (COND + ((OR (AND (CHARP |s|) (SPADLET |c| |s|)) + (AND (EQL (|#| |s|) 1) (SPADLET |c| (ELT |s| 0)))) + (COND + ((member |s| |$charEscapeList|) + (STRCONC |$charBack| |c|)) + ('T |s|))) + ('T (SPADLET |k| 0) (SPADLET |m| (MAXINDEX |s|)) + (SPADLET |insertIndex| NIL) + (DO () ((NULL (<= |k| |m|)) NIL) + (SEQ (EXIT (PROGN + (|do| (PROGN + (SPADLET |char| (ELT |s| |k|)) + (COND + ((BOOT-EQUAL |char| |$charBack|) + (SPADLET |k| (PLUS |k| 2))) + ((member |char| |$charEscapeList|) + (RETURN + (SPADLET |insertIndex| |k|)))))) + (SPADLET |k| (PLUS |k| 1)))))) + (COND + (|insertIndex| + (|checkAddBackSlashes| + (STRCONC (SUBSTRING |s| 0 |insertIndex|) + |$charBack| (ELT |s| |k|) + (SUBSTRING |s| (PLUS |insertIndex| 1) + NIL)))) + ('T |s|)))))))) + +;checkAddSpaces u == +; null u => nil +; null rest u => u +; space := $charBlank +; u2 := nil +; for i in 1.. for f in u repeat +; -- want newlines before and after begin/end verbatim and between lines +; -- since this might be written to a file, we can't really use +; -- newline characters. The Browser and HD will do the translation +; -- later. +; if f = '"\begin{verbatim}" then +; space := $charFauxNewline +; if null u2 then u2 := [space] +; if i > 1 then u2 := [:u2, space, f] +; else u2 := [:u2, f] +; if f = '"\end{verbatim}" then +; u2 := [:u2, space] +; space := $charBlank +; u2 + +(DEFUN |checkAddSpaces| (|u|) + (PROG (|u2| |space|) + (declare (special |$charBlank| |$charFauxNewline|)) + (RETURN + (SEQ (COND + ((NULL |u|) NIL) + ((NULL (CDR |u|)) |u|) + ('T (SPADLET |space| |$charBlank|) (SPADLET |u2| NIL) + (DO ((|i| 1 (QSADD1 |i|)) (G167557 |u| (CDR G167557)) + (|f| NIL)) + ((OR (ATOM G167557) + (PROGN (SETQ |f| (CAR G167557)) NIL)) + NIL) + (SEQ (EXIT (PROGN + (COND + ((BOOT-EQUAL |f| + "\\begin{verbatim}") + (SPADLET |space| |$charFauxNewline|) + (COND + ((NULL |u2|) + (SPADLET |u2| (CONS |space| NIL))) + ('T NIL)))) + (COND + ((> |i| 1) + (SPADLET |u2| + (APPEND |u2| + (CONS |space| (CONS |f| NIL))))) + ('T + (SPADLET |u2| + (APPEND |u2| (CONS |f| NIL))))) + (COND + ((BOOT-EQUAL |f| + "\\end{verbatim}") + (SPADLET |u2| + (APPEND |u2| + (CONS |space| NIL))) + (SPADLET |space| |$charBlank|)) + ('T NIL)))))) + |u2|)))))) + +;checkSplitBrace x == +; CHARP x => [x] +; #x = 1 => [x.0] +; (u := checkSplitBackslash x) +; and rest u => "append"/[checkSplitBrace y for y in u] +; m := MAXINDEX x +; (u := checkSplitOn x) +; and rest u => "append"/[checkSplitBrace y for y in u] +; (u := checkSplitPunctuation x) +; and rest u => "append"/[checkSplitBrace y for y in u] +; [x] + +(DEFUN |checkSplitBrace| (|x|) + (PROG (|m| |u|) + (RETURN + (SEQ (COND + ((CHARP |x|) (CONS |x| NIL)) + ((EQL (|#| |x|) 1) (CONS (ELT |x| 0) NIL)) + ((AND (SPADLET |u| (|checkSplitBackslash| |x|)) (CDR |u|)) + (PROG (G167644) + (SPADLET G167644 NIL) + (RETURN + (DO ((G167649 |u| (CDR G167649)) (|y| NIL)) + ((OR (ATOM G167649) + (PROGN (SETQ |y| (CAR G167649)) NIL)) + G167644) + (SEQ (EXIT (SETQ G167644 + (APPEND G167644 + (|checkSplitBrace| |y|))))))))) + ('T (SPADLET |m| (MAXINDEX |x|)) + (COND + ((AND (SPADLET |u| (|checkSplitOn| |x|)) (CDR |u|)) + (PROG (G167655) + (SPADLET G167655 NIL) + (RETURN + (DO ((G167660 |u| (CDR G167660)) (|y| NIL)) + ((OR (ATOM G167660) + (PROGN (SETQ |y| (CAR G167660)) NIL)) + G167655) + (SEQ (EXIT (SETQ G167655 + (APPEND G167655 + (|checkSplitBrace| |y|))))))))) + ((AND (SPADLET |u| (|checkSplitPunctuation| |x|)) + (CDR |u|)) + (PROG (G167666) + (SPADLET G167666 NIL) + (RETURN + (DO ((G167671 |u| (CDR G167671)) (|y| NIL)) + ((OR (ATOM G167671) + (PROGN (SETQ |y| (CAR G167671)) NIL)) + G167666) + (SEQ (EXIT (SETQ G167666 + (APPEND G167666 + (|checkSplitBrace| |y|))))))))) + ('T (CONS |x| NIL))))))))) + +;checkSplitBackslash x == +; not STRINGP x => [x] +; m := MAXINDEX x +; (k := charPosition($charBack,x,0)) < m => +; m = 1 or ALPHA_-CHAR_-P(x . (k + 1)) => --starts with a backslash so.. +; (k := charPosition($charBack,x,1)) < m => --..see if there is another +; [SUBSTRING(x,0,k),:checkSplitBackslash SUBSTRING(x,k,nil)] -- yup +; [x] --no, just return line +; k = 0 => --starts with backspace but x.1 is not a letter; break it up +; [SUBSTRING(x,0,2),:checkSplitBackslash SUBSTRING(x,2,nil)] +; u := SUBSTRING(x,0,k) +; v := SUBSTRING(x,k,2) +; k + 1 = m => [u,v] +; [u,v,:checkSplitBackslash SUBSTRING(x,k + 2,nil)] +; [x] + +(DEFUN |checkSplitBackslash| (|x|) + (PROG (|m| |k| |u| |v|) + (declare (special |$charBack|)) + (RETURN + (COND + ((NULL (STRINGP |x|)) (CONS |x| NIL)) + ('T (SPADLET |m| (MAXINDEX |x|)) + (COND + ((> |m| (SPADLET |k| (|charPosition| |$charBack| |x| 0))) + (COND + ((OR (EQL |m| 1) (ALPHA-CHAR-P (ELT |x| (PLUS |k| 1)))) + (COND + ((> |m| + (SPADLET |k| (|charPosition| |$charBack| |x| 1))) + (CONS (SUBSTRING |x| 0 |k|) + (|checkSplitBackslash| (SUBSTRING |x| |k| NIL)))) + ('T (CONS |x| NIL)))) + ((EQL |k| 0) + (CONS (SUBSTRING |x| 0 2) + (|checkSplitBackslash| (SUBSTRING |x| 2 NIL)))) + ('T (SPADLET |u| (SUBSTRING |x| 0 |k|)) + (SPADLET |v| (SUBSTRING |x| |k| 2)) + (COND + ((BOOT-EQUAL (PLUS |k| 1) |m|) + (CONS |u| (CONS |v| NIL))) + ('T + (CONS |u| + (CONS |v| + (|checkSplitBackslash| + (SUBSTRING |x| (PLUS |k| 2) NIL))))))))) + ('T (CONS |x| NIL)))))))) + +;checkSplitPunctuation x == +; CHARP x => [x] +; m := MAXINDEX x +; m < 1 => [x] +; lastchar := x.m +; lastchar = $charPeriod and x.(m - 1) = $charPeriod => +; m = 1 => [x] +; m > 3 and x.(m-2) = $charPeriod => +; [:checkSplitPunctuation SUBSTRING(x,0,m-2),'"..."] +; [:checkSplitPunctuation SUBSTRING(x,0,m-1),'".."] +; lastchar = $charPeriod or lastchar = $charSemiColon or lastchar = $charComma +; => [SUBSTRING(x,0,m),lastchar] +; m > 1 and x.(m - 1) = $charQuote => [SUBSTRING(x,0,m - 1),SUBSTRING(x,m-1,nil)] +; (k := charPosition($charBack,x,0)) < m => +; k = 0 => +; m = 1 or HGET($htMacroTable,x) or ALPHA_-CHAR_-P x.1 => [x] +; v := SUBSTRING(x,2,nil) +; [SUBSTRING(x,0,2),:checkSplitPunctuation v] +; u := SUBSTRING(x,0,k) +; v := SUBSTRING(x,k,nil) +; [:checkSplitPunctuation u,:checkSplitPunctuation v] +; (k := charPosition($charDash,x,1)) < m => +; u := SUBSTRING(x,k + 1,nil) +; [SUBSTRING(x,0,k),$charDash,:checkSplitPunctuation u] +; [x] + +(DEFUN |checkSplitPunctuation| (|x|) + (PROG (|m| |lastchar| |v| |k| |u|) + (declare (special |$charDash| |$htMacroTable| |$charBack| |$charQuote| + |$charComma| |$charSemiColon| |$charPeriod| + |$charPeriod|)) + (RETURN + (COND + ((CHARP |x|) (CONS |x| NIL)) + ('T (SPADLET |m| (MAXINDEX |x|)) + (COND + ((> 1 |m|) (CONS |x| NIL)) + ('T (SPADLET |lastchar| (ELT |x| |m|)) + (COND + ((AND (BOOT-EQUAL |lastchar| |$charPeriod|) + (BOOT-EQUAL (ELT |x| (SPADDIFFERENCE |m| 1)) + |$charPeriod|)) + (COND + ((EQL |m| 1) (CONS |x| NIL)) + ((AND (> |m| 3) + (BOOT-EQUAL (ELT |x| (SPADDIFFERENCE |m| 2)) + |$charPeriod|)) + (APPEND (|checkSplitPunctuation| + (SUBSTRING |x| 0 (SPADDIFFERENCE |m| 2))) + (CONS "..." NIL))) + ('T + (APPEND (|checkSplitPunctuation| + (SUBSTRING |x| 0 (SPADDIFFERENCE |m| 1))) + (CONS ".." NIL))))) + ((OR (BOOT-EQUAL |lastchar| |$charPeriod|) + (BOOT-EQUAL |lastchar| |$charSemiColon|) + (BOOT-EQUAL |lastchar| |$charComma|)) + (CONS (SUBSTRING |x| 0 |m|) (CONS |lastchar| NIL))) + ((AND (> |m| 1) + (BOOT-EQUAL (ELT |x| (SPADDIFFERENCE |m| 1)) + |$charQuote|)) + (CONS (SUBSTRING |x| 0 (SPADDIFFERENCE |m| 1)) + (CONS (SUBSTRING |x| (SPADDIFFERENCE |m| 1) NIL) + NIL))) + ((> |m| (SPADLET |k| (|charPosition| |$charBack| |x| 0))) + (COND + ((EQL |k| 0) + (COND + ((OR (EQL |m| 1) (HGET |$htMacroTable| |x|) + (ALPHA-CHAR-P (ELT |x| 1))) + (CONS |x| NIL)) + ('T (SPADLET |v| (SUBSTRING |x| 2 NIL)) + (CONS (SUBSTRING |x| 0 2) + (|checkSplitPunctuation| |v|))))) + ('T (SPADLET |u| (SUBSTRING |x| 0 |k|)) + (SPADLET |v| (SUBSTRING |x| |k| NIL)) + (APPEND (|checkSplitPunctuation| |u|) + (|checkSplitPunctuation| |v|))))) + ((> |m| (SPADLET |k| (|charPosition| |$charDash| |x| 1))) + (SPADLET |u| (SUBSTRING |x| (PLUS |k| 1) NIL)) + (CONS (SUBSTRING |x| 0 |k|) + (CONS |$charDash| (|checkSplitPunctuation| |u|)))) + ('T (CONS |x| NIL)))))))))) + +;checkSplitOn(x) == +; CHARP x => [x] +; l := $charSplitList +; m := MAXINDEX x +; while l repeat +; char := first l +; do +; m = 0 and x.0 = char => return (k := -1) --special exit +; k := charPosition(char,x,0) +; k > 0 and x.(k - 1) = $charBack => [x] +; k <= m => return k +; l := rest l +; null l => [x] +; k = -1 => [char] +; k = 0 => [char,SUBSTRING(x,1,nil)] +; k = MAXINDEX x => [SUBSTRING(x,0,k),char] +; [SUBSTRING(x,0,k),char,:checkSplitOn SUBSTRING(x,k + 1,nil)] + +(DEFUN |checkSplitOn| (|x|) + (PROG (|m| |char| |k| |l|) + (declare (special |$charBack| |$charSplitList|)) + (RETURN + (SEQ (COND + ((CHARP |x|) (CONS |x| NIL)) + ('T (SPADLET |l| |$charSplitList|) + (SPADLET |m| (MAXINDEX |x|)) + (DO () ((NULL |l|) NIL) + (SEQ (EXIT (PROGN + (SPADLET |char| (CAR |l|)) + (|do| (COND + ((AND (EQL |m| 0) + (BOOT-EQUAL (ELT |x| 0) |char|)) + (RETURN + (SPADLET |k| + (SPADDIFFERENCE 1)))) + ('T + (SPADLET |k| + (|charPosition| |char| |x| 0)) + (COND + ((AND (> |k| 0) + (BOOT-EQUAL + (ELT |x| + (SPADDIFFERENCE |k| 1)) + |$charBack|)) + (CONS |x| NIL)) + ((<= |k| |m|) (RETURN |k|)))))) + (SPADLET |l| (CDR |l|)))))) + (COND + ((NULL |l|) (CONS |x| NIL)) + ((BOOT-EQUAL |k| (SPADDIFFERENCE 1)) (CONS |char| NIL)) + ((EQL |k| 0) + (CONS |char| (CONS (SUBSTRING |x| 1 NIL) NIL))) + ((BOOT-EQUAL |k| (MAXINDEX |x|)) + (CONS (SUBSTRING |x| 0 |k|) (CONS |char| NIL))) + ('T + (CONS (SUBSTRING |x| 0 |k|) + (CONS |char| + (|checkSplitOn| + (SUBSTRING |x| (PLUS |k| 1) NIL)))))))))))) + +;checkInteger s == +; CHARP s => false +; s = '"" => false +; and/[DIGIT_-CHAR_-P s.i for i in 0..MAXINDEX s] + +(DEFUN |checkInteger| (|s|) + (PROG () + (RETURN + (SEQ (COND + ((CHARP |s|) NIL) + ((BOOT-EQUAL |s| "") NIL) + ('T + (PROG (G167927) + (SPADLET G167927 'T) + (RETURN + (DO ((G167933 NIL (NULL G167927)) + (G167934 (MAXINDEX |s|)) (|i| 0 (QSADD1 |i|))) + ((OR G167933 (QSGREATERP |i| G167934)) + G167927) + (SEQ (EXIT (SETQ G167927 + (AND G167927 + (DIGIT-CHAR-P (ELT |s| |i|))))))))))))))) + +;--======================================================================= +;-- Code for creating a personalized report for ++ comments +;--======================================================================= +;docreport(nam) == +;--creates a report for person "nam" using file "whofiles" +; OBEY '"rm docreport.input" +; OBEY STRCONC('"echo _")bo setOutStream('",STRINGIMAGE nam,'")_" > temp.input") +; OBEY '"cat docreport.header temp.input > docreport.input" +; OBEY STRCONC('"awk '/",STRINGIMAGE nam,'"/ {printf(_")co %s.spad\n_",$2)}' whofiles > temp.input") +; OBEY '"cat docreport.input temp.input > temp1.input" +; OBEY '"cat temp1.input docreport.trailer > docreport.input" +; OBEY '"rm temp.input" +; OBEY '"rm temp1.input" +; SETQ(_/EDITFILE,'"docreport.input") +; _/RQ() + +(DEFUN |docreport| (|nam|) + (PROGN + (OBEY "rm docreport.input") + (OBEY (STRCONC "echo \")bo setOutStream('" + (STRINGIMAGE |nam|) ")\" > temp.input")) + (OBEY "cat docreport.header temp.input > docreport.input") + (OBEY (STRCONC "awk '/" (STRINGIMAGE |nam|) + "/ {printf(\")co %s.spad\\n\",$2)}' whofiles > temp.input")) + (OBEY "cat docreport.input temp.input > temp1.input") + (OBEY "cat temp1.input docreport.trailer > docreport.input") + (OBEY "rm temp.input") + (OBEY "rm temp1.input") + (SETQ /EDITFILE "docreport.input") + (/RQ))) + +;setOutStream nam == +; filename := STRCONC('"/tmp/",STRINGIMAGE nam,".docreport") +; $outStream := MAKE_-OUTSTREAM filename + +(DEFUN |setOutStream| (|nam|) + (PROG (|filename|) + (declare (special |$outStream|)) + (RETURN + (PROGN + (SPADLET |filename| + (STRCONC "/tmp/" (STRINGIMAGE |nam|) + (INTERN ".docreport" "BOOT"))) + (SPADLET |$outStream| (MAKE-OUTSTREAM |filename|)))))) + +;--======================================================================= +;-- Report Documentation Error +;--======================================================================= + +\end{chunk} +\eject +\begin{thebibliography}{99} +\bibitem{1} nothing +\end{thebibliography} +\end{document} diff --git a/src/interp/c-util.lisp.pamphlet b/src/interp/c-util.lisp.pamphlet index 0fd71f1..fde8dc7 100644 --- a/src/interp/c-util.lisp.pamphlet +++ b/src/interp/c-util.lisp.pamphlet @@ -2996,7 +2996,7 @@ (NREVERSE0 G4229)) (SEQ (EXIT (SETQ G4229 (CONS (CONS |o| |n|) G4229)))))))) - (|traverse| (|function| |GEQNSUBSTLIST,GSUBSTinner|) + (|traverse| #'|GEQNSUBSTLIST,GSUBSTinner| |alist| |body|))))))) ; diff --git a/src/interp/cattable.lisp.pamphlet b/src/interp/cattable.lisp.pamphlet index 2abb6c0..5ba9fa7 100644 --- a/src/interp/cattable.lisp.pamphlet +++ b/src/interp/cattable.lisp.pamphlet @@ -886,7 +886,7 @@ (|simpCatPredicate| (|simpBool| |b|)))))) (HPUT *ANCESTORS-HASH* |id| - (|listSort| (|function| GLESSEQP) + (|listSort| #'GLESSEQP |item|)))))))))) ;addToCategoryTable con == @@ -1841,14 +1841,14 @@ NIL) (SEQ (EXIT (|categoryParts,build| |x| 'T)))) (SPADLET |$attrlist| - (|listSort| (|function| GLESSEQP) |$attrlist|)) + (|listSort| #'GLESSEQP |$attrlist|)) (SPADLET |$oplist| - (|listSort| (|function| GLESSEQP) |$oplist|)) + (|listSort| #'GLESSEQP |$oplist|)) (SPADLET |res| (CONS |$attrlist| |$oplist|)) (COND (|cons?| (SPADLET |res| (CONS (|listSort| - (|function| GLESSEQP) + #'GLESSEQP |$conslist|) |res|)))) (COND diff --git a/src/interp/clam.lisp.pamphlet b/src/interp/clam.lisp.pamphlet index 5b7936b..1e41c34 100644 --- a/src/interp/clam.lisp.pamphlet +++ b/src/interp/clam.lisp.pamphlet @@ -227,7 +227,7 @@ (CONS |g1| (CONS (CONS 'apply (CONS - (CONS '|function| + (CONS 'function (CONS |auxfn| NIL)) (CONS |g1| NIL))) NIL))))) @@ -333,7 +333,7 @@ (|bright| "Generated LISP code for function:")) (|pp| |computeFunction|))) (|compileQuietly| (CONS |computeFunction| NIL)) - (SPADLET |cacheType| '|function|) + (SPADLET |cacheType| 'function) (SPADLET |cacheResetCode| (CONS 'SETQ (CONS |cacheName| @@ -526,7 +526,7 @@ (CONS (CONS 'APPLY (CONS - (CONS '|function| + (CONS 'function (CONS |auxfn| NIL)) (CONS |g1| NIL))) NIL)))))) @@ -795,7 +795,7 @@ ('T (CONS 'apply (CONS - (CONS '|function| + (CONS 'function (CONS |auxfn| NIL)) (CONS |g1| NIL)))))) (CONS |g1| diff --git a/src/interp/clammed.lisp.pamphlet b/src/interp/clammed.lisp.pamphlet index 1647701..b237ebe 100644 --- a/src/interp/clammed.lisp.pamphlet +++ b/src/interp/clammed.lisp.pamphlet @@ -35,7 +35,7 @@ ('T (CDR (HPUT |canCoerceFrom;AL| G166064 (CONS 1 - (APPLY (|function| |canCoerceFrom;|) + (APPLY #'|canCoerceFrom;| G166064))))))))))) (DEFUN |canCoerceFrom;| (|mr| |m|) @@ -74,7 +74,7 @@ ('T (CDR (HPUT |canCoerce;AL| G166077 (CONS 1 - (APPLY (|function| |canCoerce;|) + (APPLY #'|canCoerce;| G166077))))))))))) (DEFUN |canCoerce;| (|t1| |t2|) @@ -118,8 +118,7 @@ ('T (CDR (HPUT |coerceConvertMmSelection;AL| G166143 (CONS 1 - (APPLY (|function| - |coerceConvertMmSelection;|) + (APPLY #'|coerceConvertMmSelection;| G166143))))))))))) (DEFUN |coerceConvertMmSelection;| (|funName| |m1| |m2|) @@ -198,7 +197,7 @@ ('T (CDR (HPUT |hasFileProperty;AL| G166152 (CONS 1 - (APPLY (|function| |hasFileProperty;|) + (APPLY #'|hasFileProperty;| G166152))))))))))) (DEFUN |hasFileProperty;| (|p| |id| |abbrev|) @@ -555,7 +554,7 @@ ('T (CDR (HPUT |selectMms1;AL| G166406 (CONS 1 - (APPLY (|function| |selectMms1;|) + (APPLY #'|selectMms1;| G166406))))))))))) (DEFUN |selectMms1;| (|op| |tar| |args1| |args2| |$Coerce|) @@ -602,7 +601,7 @@ ('T (CDR (HPUT |resolveTT;AL| G166423 (CONS 1 - (APPLY (|function| |resolveTT;|) + (APPLY #'|resolveTT;| G166423))))))))))) (DEFUN |resolveTT;| (|t1| |t2|) @@ -682,7 +681,7 @@ ('T (CDR (HPUT |isLegitimateMode;AL| G166535 (CONS 1 - (APPLY (|function| |isLegitimateMode;|) + (APPLY #'|isLegitimateMode;| G166535))))))))))) (DEFUN |isLegitimateMode;| (|t| |hasPolyMode| |polyVarList|) diff --git a/src/interp/g-util.lisp.pamphlet b/src/interp/g-util.lisp.pamphlet index 22ad63d..25e4728 100644 --- a/src/interp/g-util.lisp.pamphlet +++ b/src/interp/g-util.lisp.pamphlet @@ -577,7 +577,7 @@ ((NULL (LISTP LIST)) (|error| '|listSort: second argument must be a list|)) ((NULL |optional|) - (|mergeSort| |pred| (|function| |Identity|) LIST + (|mergeSort| |pred| #'|Identity| LIST (LENGTH LIST))) ('T (SPADLET |key| (CAR |optional|)) (COND @@ -588,15 +588,15 @@ ;MSORT list == listSort(function GLESSEQP, COPY_-LIST list) (DEFUN MSORT (LIST) - (|listSort| (|function| GLESSEQP) (COPY-LIST LIST))) + (|listSort| #'GLESSEQP (COPY-LIST LIST))) ;NMSORT list == listSort(function GLESSEQP, list) -(DEFUN NMSORT (LIST) (|listSort| (|function| GLESSEQP) LIST)) +(DEFUN NMSORT (LIST) (|listSort| #'GLESSEQP LIST)) ;orderList l == listSort(function _?ORDER, COPY_-LIST l) -(DEFUN |orderList| (|l|) (|listSort| (|function| ?ORDER) (COPY-LIST |l|))) +(DEFUN |orderList| (|l|) (|listSort| #'?ORDER (COPY-LIST |l|))) ;mergeInPlace(f,g,p,q) == ; if NULL p then return p diff --git a/src/interp/i-coerce.lisp.pamphlet b/src/interp/i-coerce.lisp.pamphlet index 5f774d3..e086ad2 100644 --- a/src/interp/i-coerce.lisp.pamphlet +++ b/src/interp/i-coerce.lisp.pamphlet @@ -759,7 +759,7 @@ The special routines that do the coercions typically involve a "2" (CONS |target| (CONS |t| NIL)) |dcVector|)) (COND ((NULL |fun|) NIL) - ((BOOT-EQUAL (CAR |fun|) (|function| |Undef|)) NIL) + ((BOOT-EQUAL (CAR |fun|) #'|Undef|) NIL) ('T (SPADLET $ |dcVector|) (SPADLET |object'| (|coerceUnion2Branch| @@ -3435,7 +3435,7 @@ Interpreter Coercion Query Functions ('T (SPADLET |fn| (CAR |fun|)) (SPADLET |d| (CDR |fun|)) (COND - ((BOOT-EQUAL |fn| (|function| |Undef|)) + ((BOOT-EQUAL |fn| #'|Undef|) NIL) ('T (SPADLET |code| @@ -3443,7 +3443,7 @@ Interpreter Coercion Query Functions (CONS (CONS 'CONS (CONS - (CONS '|function| + (CONS 'function (CONS '|coerceIntByMapInner| NIL)) (CONS (MKQ (CONS |u1| |u2|)) @@ -4340,7 +4340,7 @@ Interpreter Coercion Query Functions (SPADLET |fn| (CAR |fun|)) (SPADLET |d| (CDR |fun|)) (COND - ((BOOT-EQUAL |fn| (|function| |Undef|)) NIL) + ((BOOT-EQUAL |fn| #'|Undef|) NIL) ((|isWrapped| |x|) (SPADLET $ |dcVector|) (SPADLET |val| (CATCH '|coerceFailure| diff --git a/src/interp/i-eval.lisp.pamphlet b/src/interp/i-eval.lisp.pamphlet index 597ba76..eada522 100644 --- a/src/interp/i-eval.lisp.pamphlet +++ b/src/interp/i-eval.lisp.pamphlet @@ -457,8 +457,7 @@ (CONS (QUOTE FUNCALL) (CONS - (CONS - (QUOTE |function|) + (CONS 'function (CONS (CONS (QUOTE LAMBDA) (CONS |xargs| |xbody|)) NIL)) (TAKE (|#| |xargs|) |form|)))))) ((QUOTE T) @@ -472,7 +471,7 @@ (SPADLET |bpi| (CAR |fun0|)) (SPADLET |domain| (CDR |fun0|)) (COND - ((EQ |bpi| (|function| |Undef|)) + ((EQ |bpi| #'|Undef|) (|sayKeyedMsg| (QUOTE S2IE0009) (CONS |opName| (CONS diff --git a/src/interp/i-funsel.lisp.pamphlet b/src/interp/i-funsel.lisp.pamphlet index 067338a..9fd9d41 100644 --- a/src/interp/i-funsel.lisp.pamphlet +++ b/src/interp/i-funsel.lisp.pamphlet @@ -2566,7 +2566,7 @@ the types A and B themselves are not sorted by preference. (|evalDomain| |dom|))))) (COND ((OR (NULL |fun|) (NULL (CONSP |fun|))) NIL) - ((BOOT-EQUAL (CAR |fun|) (|function| |Undef|)) + ((BOOT-EQUAL (CAR |fun|) #'|Undef|) (|throwKeyedMsg| 'S2IS0023 (CONS |opName| (CONS |dom| NIL)))) (t @@ -4902,7 +4902,7 @@ the types A and B themselves are not sorted by preference. (t (setq |st| (NREVERSE (NCONC |haventvars| |havevars|))) - (SORT |st| (|function| |mmCatComp|)))))))))))) + (SORT |st| #'|mmCatComp|))))))))))) ;mmCatComp(c1, c2) == ; b1 := ASSQ(CADR c1, $Subst) diff --git a/src/interp/i-map.lisp.pamphlet b/src/interp/i-map.lisp.pamphlet index 7a7e3e5..d9766c6 100644 --- a/src/interp/i-map.lisp.pamphlet +++ b/src/interp/i-map.lisp.pamphlet @@ -2761,7 +2761,7 @@ (CONS (CONS 'LIST (CONS - (CONS '|function| + (CONS 'function (CONS |imp| NIL)) NIL)) NIL)))) diff --git a/src/interp/i-spec1.lisp.pamphlet b/src/interp/i-spec1.lisp.pamphlet index 81618c7..6e0d726 100644 --- a/src/interp/i-spec1.lisp.pamphlet +++ b/src/interp/i-spec1.lisp.pamphlet @@ -515,7 +515,7 @@ There are several special modes used in these functions: (COND ((AND (NULL |$definingMap|) (OR |$genValue| |$compilingMap|)) (SPADLET |fun| - (CONS '|function| + (CONS 'function (CONS (CONS 'LAMBDA (CONS (APPEND |vars| @@ -529,7 +529,7 @@ There are several special modes used in these functions: (SPADLET |$boundVariables| (CONS |minivectorName| |vars|)) (SPADLET |body| (|checkForFreeVariables| |body| 'ALL)) (SPADLET |fun| - (CONS '|function| + (CONS 'function (CONS (CONS 'LAMBDA (CONS (APPEND |vars| @@ -3155,7 +3155,7 @@ There are several special modes used in these functions: (|checkForFreeVariables| (|getValue| |funBody|) |$localVars|)) (SPADLET |val| - (CONS '|function| + (CONS 'function (CONS (CONS 'LAMBDA (CONS (CONS |index| @@ -3773,7 +3773,7 @@ There are several special modes used in these functions: |form| |$localVars|) G168634)))))))) (SPADLET |val| - (CONS '|function| + (CONS 'function (CONS (CONS 'LAMBDA (CONS (CONS |$index| diff --git a/src/interp/interop.lisp.pamphlet b/src/interp/interop.lisp.pamphlet index 50ecb64..28d1dae 100644 --- a/src/interp/interop.lisp.pamphlet +++ b/src/interp/interop.lisp.pamphlet @@ -84,22 +84,22 @@ (COND ((BOOT-EQUAL |name0| '->) (SPADLET |froms| (CAR |args|)) (SPADLET |froms| - (MAPCAR (|function| |DNameToSExpr|) (CDR |froms|))) + (MAPCAR #'|DNameToSExpr| (CDR |froms|))) (SPADLET |ret| (CAR (CDR |args|))) (SPADLET |ret| (|DNameToSExpr| (CAR (CDR |ret|)))) (CONS '|Mapping| (CONS |ret| |froms|))) ((OR (BOOT-EQUAL |name0| '|Union|) (BOOT-EQUAL |name0| '|Record|)) (SPADLET |sxs| - (MAPCAR (|function| |DNameToSExpr|) + (MAPCAR #'|DNameToSExpr| (CDR (CAR |args|)))) (CONS |name0| |sxs|)) ((BOOT-EQUAL |name0| '|Enumeration|) (CONS |name0| - (MAPCAR (|function| |DNameFixEnum|) + (MAPCAR #'|DNameFixEnum| (CDR (CAR |args|))))) ('T - (CONS |name0| (MAPCAR (|function| |DNameToSExpr|) |args|))))))))) + (CONS |name0| (MAPCAR #'|DNameToSExpr| |args|))))))))) ;DNameToSExpr dname == ; CAR dname = DNameOtherID => @@ -211,7 +211,7 @@ (CDR (GETDATABASE (CAR |sexpr|) 'COSIG))) (CONS |DNameApplyID| (CONS |name0| - (MAPCAR (|function| |SExprToDName|) + (MAPCAR #'|SExprToDName| (CDR |sexpr|) |newCosig|))))))))))))) ;-- local garbage because Compiler strings are null terminated @@ -296,7 +296,7 @@ ; [function runOldAxiomFunctor,:SYMBOL_-FUNCTION name] (DEFUN |closeOldAxiomFunctor| (|name|) - (CONS (|function| |runOldAxiomFunctor|) (SYMBOL-FUNCTION |name|))) + (CONS #'|runOldAxiomFunctor| (SYMBOL-FUNCTION |name|))) ;lazyOldAxiomDomainLookupExport(domenv, self, op, sig, box, skipdefaults, env) == ; dom := instantiate domenv @@ -348,12 +348,12 @@ (SPADLET |$lazyOldAxiomDomainDispatch| (VECTOR '|lazyOldAxiomDomain| - (CONS (|function| |lazyOldAxiomDomainDevaluate|) NIL) + (CONS #'|lazyOldAxiomDomainDevaluate| NIL) (CONS NIL NIL) - (CONS (|function| |lazyOldAxiomDomainLookupExport|) + (CONS #'|lazyOldAxiomDomainLookupExport| NIL) - (CONS (|function| |lazyOldAxiomDomainHashCode|) NIL) - (CONS (|function| |lazyOldAxiomAddChild|) NIL))) + (CONS #'|lazyOldAxiomDomainHashCode| NIL) + (CONS #'|lazyOldAxiomAddChild| NIL))) ;-- old Axiom pre category objects are just (dispatch . catform) ;-- where catform is ('categoryname,: evaluated args) @@ -415,10 +415,10 @@ (SPADLET |$oldAxiomPreCategoryDispatch| (VECTOR '|oldAxiomPreCategory| - (CONS (|function| |oldAxiomPreCategoryDevaluate|) NIL) + (CONS #'|oldAxiomPreCategoryDevaluate| NIL) (CONS NIL NIL) (CONS NIL NIL) - (CONS (|function| |oldAxiomPreCategoryHashCode|) NIL) - (CONS (|function| |oldAxiomPreCategoryBuild|) NIL) + (CONS #'|oldAxiomPreCategoryHashCode| NIL) + (CONS #'|oldAxiomPreCategoryBuild| NIL) (CONS NIL NIL))) ;oldAxiomCategoryDevaluate([[op,:args],:.], env) == @@ -580,13 +580,13 @@ (SPADLET |$oldAxiomCategoryDispatch| (VECTOR '|oldAxiomCategory| - (CONS (|function| |oldAxiomCategoryDevaluate|) NIL) + (CONS #'|oldAxiomCategoryDevaluate| NIL) (CONS NIL NIL) - (CONS (|function| |oldAxiomCategoryLookupExport|) NIL) - (CONS (|function| |oldAxiomCategoryHashCode|) NIL) - (CONS (|function| |oldAxiomCategoryBuild|) NIL) - (CONS (|function| |oldAxiomCategoryParentCount|) NIL) - (CONS (|function| |oldAxiomCategoryNthParent|) NIL))) + (CONS #'|oldAxiomCategoryLookupExport| NIL) + (CONS #'|oldAxiomCategoryHashCode| NIL) + (CONS #'|oldAxiomCategoryBuild| NIL) + (CONS #'|oldAxiomCategoryParentCount| NIL) + (CONS #'|oldAxiomCategoryNthParent| NIL))) ;attributeDevaluate(attrObj, env) == ; [name, hash] := attrObj @@ -667,13 +667,13 @@ (SPADLET |$attributeDispatch| (VECTOR '|attribute| - (CONS (|function| |attributeDevaluate|) NIL) + (CONS #'|attributeDevaluate| NIL) (CONS NIL NIL) - (CONS (|function| |attributeLookupExport|) NIL) - (CONS (|function| |attributeHashCode|) NIL) - (CONS (|function| |attributeCategoryBuild|) NIL) - (CONS (|function| |attributeCategoryParentCount|) NIL) - (CONS (|function| |attributeNthParent|) NIL))) + (CONS #'|attributeLookupExport| NIL) + (CONS #'|attributeHashCode| NIL) + (CONS #'|attributeCategoryBuild| NIL) + (CONS #'|attributeCategoryParentCount| NIL) + (CONS #'|attributeNthParent| NIL))) ;orderedDefaults(conform,domform) == ; $depthAssocCache : local := MAKE_-HASHTABLE 'ID @@ -891,11 +891,11 @@ (SPADLET |$oldAxiomDomainDispatch| (VECTOR '|oldAxiomDomain| - (CONS (|function| |oldAxiomDomainDevaluate|) NIL) + (CONS #'|oldAxiomDomainDevaluate| NIL) (CONS NIL NIL) - (CONS (|function| |oldAxiomDomainLookupExport|) NIL) - (CONS (|function| |oldAxiomDomainHashCode|) NIL) - (CONS (|function| |oldAxiomAddChild|) NIL))) + (CONS #'|oldAxiomDomainLookupExport| NIL) + (CONS #'|oldAxiomDomainHashCode| NIL) + (CONS #'|oldAxiomAddChild| NIL))) ;coerceConvertMmSelection(funName,m1,m2) == ; -- calls selectMms with $Coerce=NIL and tests for required @@ -920,8 +920,7 @@ ('T (CDR (HPUT |coerceConvertMmSelection;AL| G166554 (CONS 1 - (APPLY (|function| - |coerceConvertMmSelection;|) + (APPLY #'|coerceConvertMmSelection;| G166554))))))))))) diff --git a/src/interp/newfort.lisp.pamphlet b/src/interp/newfort.lisp.pamphlet index d89c3e1..e432ba5 100644 --- a/src/interp/newfort.lisp.pamphlet +++ b/src/interp/newfort.lisp.pamphlet @@ -1372,7 +1372,7 @@ (DEFUN |mkFortFn| (|op| |args| |nargs|) (CONS (|fortranifyFunctionName| (STRINGIMAGE |op|) |nargs|) - (MAPCAR (|function| |fortPre1|) |args|))) + (MAPCAR #'|fortPre1| |args|))) ;fortranifyFunctionName(op,nargs) == ; op = '"<" => '".LT." @@ -2645,9 +2645,9 @@ (COND ((ATOM |e|) (LENGTH (STRINGIMAGE |e|))) ((> (|#| |e|) 3) - (PLUS 2 (|fortSize| (MAPCAR (|function| |fortExpSize|) |e|)))) + (PLUS 2 (|fortSize| (MAPCAR #'|fortExpSize| |e|)))) ((QSLESSP (|#| |e|) 3) - (PLUS 2 (|fortSize| (MAPCAR (|function| |fortExpSize|) |e|)))) + (PLUS 2 (|fortSize| (MAPCAR #'|fortExpSize| |e|)))) ('T (SPADLET |op| (CAR |e|)) (SPADLET |arg1| (CADR |e|)) (SPADLET |arg2| (CADDR |e|)) (SPADLET |op| (STRINGIMAGE |op|)) (COND @@ -2668,13 +2668,13 @@ (STRINGIMAGE (CAR |arg1|))))) (PLUS 2 (|fortSize| - (MAPCAR (|function| |fortExpSize|) |e|)))) + (MAPCAR #'|fortExpSize| |e|)))) ((AND (LISTP |arg2|) (NULL (BOOT-EQUAL |op| (STRINGIMAGE (CAR |arg2|))))) (PLUS 2 (|fortSize| - (MAPCAR (|function| |fortExpSize|) |e|)))) + (MAPCAR #'|fortExpSize| |e|)))) ('T (PLUS 1 (|fortSize| @@ -2683,7 +2683,7 @@ ('T (PLUS 2 (|fortSize| - (MAPCAR (|function| |fortExpSize|) |e|)))))))))))) + (MAPCAR #'|fortExpSize| |e|)))))))))))) ;fortSize e == ; +/[elen u for u in e] where diff --git a/src/interp/nruncomp.lisp.pamphlet b/src/interp/nruncomp.lisp.pamphlet index f59d101..afbfd27 100644 --- a/src/interp/nruncomp.lisp.pamphlet +++ b/src/interp/nruncomp.lisp.pamphlet @@ -2016,8 +2016,8 @@ (SPADLET |fun| (COND (|$NRTmakeCompactDirect| - '(|function| |lookupInCompactTable|)) - ('T '(|function| |lookupInTable|)))) + '(function |lookupInCompactTable|)) + ('T '(function |lookupInTable|)))) (CONS (COND (|$QuickCode| 'QSETREFV) ('T 'SETELT)) (CONS '$ (CONS 1 @@ -2352,9 +2352,9 @@ |entry|) G167547)))))))) (SPADLET |sortedOplist| - (|listSort| (|function| GLESSEQP) + (|listSort| #'GLESSEQP (COPY-LIST |$lisplibOperationAlist|) - (|function| CADR))) + #'CADR)) (SPADLET |$lastPred| NIL) (SPADLET |$newEnv| |$e|) (SETELT |$domainShell| 1 diff --git a/src/interp/nrunopt.lisp.pamphlet b/src/interp/nrunopt.lisp.pamphlet index 35037b4..5bba013 100644 --- a/src/interp/nrunopt.lisp.pamphlet +++ b/src/interp/nrunopt.lisp.pamphlet @@ -495,8 +495,8 @@ (COND ((BOOT-EQUAL |lookupFunction| '|lookupIncomplete|) - (|function| |lookupIncomplete|)) - ('T (|function| |lookupComplete|)))) + #'|lookupIncomplete|) + ('T #'|lookupComplete|))) (SPADLET |template| (ELT |infovec| 0)) (COND ((ELT |template| 5) @@ -1415,7 +1415,7 @@ (CONS (CAAR |x|) G167039))))))))) (SPADLET |opcAlist| (NREVERSE - (SORTBY (|function| |NRTcatCompare|) + (SORTBY #'|NRTcatCompare| |pcAlist|))) (SPADLET |newPairlis| (PROG (G167056) diff --git a/src/interp/slam.lisp.pamphlet b/src/interp/slam.lisp.pamphlet index 401cecb..2718387 100644 --- a/src/interp/slam.lisp.pamphlet +++ b/src/interp/slam.lisp.pamphlet @@ -86,7 +86,7 @@ (DEFUN |reportFunctionCompilation| (|op| |nam| |argl| |body| |isRecursive|) - (PROG (|minivectorName| |init| |cacheCount| |function| |num| |auxfn| + (PROG (|minivectorName| |init| |cacheCount| function |num| |auxfn| |g1| |LETTMP#1| |arg| |computeValue| |cacheName| |g2| |g3| |secondPredPair| |thirdPredPair| |codeBody| |lamex| |mainFunction| |computeFunction| |cacheType| @@ -125,7 +125,7 @@ ((BOOT-EQUAL |cacheCount| '|all|) (|reportFunctionCacheAll| |op| |nam| |argl| |body|)) ((OR (EQL |cacheCount| 0) (NULL |argl|)) - (SPADLET |function| + (SPADLET function (CONS |nam| (CONS (CONS 'LAMBDA (CONS @@ -133,7 +133,7 @@ (CONS '|envArg| NIL)) (CONS |body| NIL))) NIL))) - (|compileInteractive| |function|) |nam|) + (|compileInteractive| function) |nam|) ('T (SPADLET |num| (COND @@ -240,7 +240,7 @@ NIL))) (|compileInteractive| |mainFunction|) (|compileInteractive| |computeFunction|) - (SPADLET |cacheType| '|function|) + (SPADLET |cacheType| 'function) (SPADLET |cacheResetCode| (CONS 'SETQ (CONS |cacheName| diff --git a/src/interp/sys-pkg.lisp.pamphlet b/src/interp/sys-pkg.lisp.pamphlet index 5ce9be3..9ff5ff2 100644 --- a/src/interp/sys-pkg.lisp.pamphlet +++ b/src/interp/sys-pkg.lisp.pamphlet @@ -248,7 +248,7 @@ provides support for compiler code. BOOT::MATCH-NEXT-TOKEN BOOT::|pathname| BOOT::|$cacheAlist| BOOT::$FUNCTION BOOT::|$reportSpadTrace| BOOT::|$tempCategoryTable| BOOT::|$underDomainAlist| - BOOT::|$whereList| BOOT::|append| BOOT::|function| + BOOT::|$whereList| BOOT::|append| BOOT::CURINPUTLINE BOOT::|sayFORMULA| BOOT::/GENVARLST BOOT::|$Category| BOOT::|$SpecialDomainNames| VMLISP::|union| BOOT::ASSOCRIGHT BOOT::CURSTRMLINE diff --git a/src/interp/template.lisp.pamphlet b/src/interp/template.lisp.pamphlet index c2f1205..2914b44 100644 --- a/src/interp/template.lisp.pamphlet +++ b/src/interp/template.lisp.pamphlet @@ -1210,7 +1210,7 @@ (SPADLET |slot| (CADDR G166936)) (SPADLET |val| (FUNCALL |fn| |dollar|)) (SPADLET |u| (ELT |dollar| |slot|)) - (RPLACA |u| (|function| IDENTITY)) + (RPLACA |u| #'IDENTITY) (RPLACD |u| |val|) |val|)))) diff --git a/src/interp/vmlisp.lisp.pamphlet b/src/interp/vmlisp.lisp.pamphlet index ba70dd2..96667fa 100644 --- a/src/interp/vmlisp.lisp.pamphlet +++ b/src/interp/vmlisp.lisp.pamphlet @@ -2428,7 +2428,6 @@ for primitive domains. Also used by putInLocalDomainReferences and optCal ; 5.3.2 Declaring Global Variables and Named Constants -(defmacro |function| (name) `(FUNCTION ,name)) (defmacro |dispatchFunction| (name) `(FUNCTION ,name)) (defun |macrop| (fn) (and (identp fn) (macro-function fn)))