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|