diff --git a/books/bookvol10.3.pamphlet b/books/bookvol10.3.pamphlet
index 7697aed..606ae91 100644
--- a/books/bookvol10.3.pamphlet
+++ b/books/bookvol10.3.pamphlet
@@ -115956,9 +115956,9 @@ SExpressionOf(Str, Sym, Int, Flt, Expr): Decl == Body where
null? b == NULL(b)$Lisp
atom? b == ATOM(b)$Lisp
- pair? b == PAIRP(b)$Lisp
+ pair? b == CONSP(b)$Lisp
- list? b == PAIRP(b)$Lisp or NULL(b)$Lisp
+ list? b == CONSP(b)$Lisp or NULL(b)$Lisp
string? b == STRINGP(b)$Lisp
symbol? b == IDENTP(b)$Lisp
integer? b == INTEGERP(b)$Lisp
diff --git a/books/bookvol5.pamphlet b/books/bookvol5.pamphlet
index 10b7db3..50beb64 100644
--- a/books/bookvol5.pamphlet
+++ b/books/bookvol5.pamphlet
@@ -1711,7 +1711,6 @@ Top-level dispatcher for the interpreter. It sets local variables
and then calls processInteractive1 to do most of the work.
This function receives the output from the parser.
\calls{processInteractive}{initializeTimedNames}
-\calls{processInteractive}{pairp}
\calls{processInteractive}{qcar}
\calls{processInteractive}{processInteractive1}
\calls{processInteractive}{reportInstantiations}
@@ -1771,7 +1770,7 @@ This function receives the output from the parser.
|$ProcessInteractiveValue| |$defaultFortVar|
|$interpreterTimedNames| |$interpreterTimedClasses|))
(|initializeTimedNames| |$interpreterTimedNames| |$interpreterTimedClasses|)
- (if (pairp form) ; compute name of operator
+ (if (consp form) ; compute name of operator
(setq |$op| (qcar form))
(setq |$op| form))
(setq |$Coerce| nil)
@@ -1883,7 +1882,6 @@ are compiling. This variable is only defined and used locally.
\end{chunk}
\defun{interpret}{Type analyzes and evaluates expression x, returns object}
-\calls{interpret}{pairp}
\calls{interpret}{interpret1}
\usesdollar{interpret}{env}
\usesdollar{interpret}{eval}
@@ -1893,7 +1891,7 @@ are compiling. This variable is only defined and used locally.
(dsetq (x . restargs) arg)
(let (|$env| |$eval| |$genValue| posnForm)
(declare (special |$env| |$eval| |$genValue|))
- (if (pairp restargs)
+ (if (consp restargs)
(setq posnForm (car restargs))
(setq posnForm restargs))
(setq |$env| (list (list nil)))
@@ -1947,7 +1945,6 @@ This is the late interpretCoerce. I removed the call to
coerceInteractive, so it only does the JENKS cases ALBI
\calls{interpret2}{objVal}
\calls{interpret2}{objMode}
-\calls{interpret2}{pairp}
\calls{interpret2}{member}
\calls{interpret2}{objNew}
\calls{interpret2}{systemErrorHere}
@@ -1968,7 +1965,7 @@ coerceInteractive, so it only does the JENKS cases ALBI
(cond
((equal m |$EmptyMode|)
(cond
- ((and (pairp x)
+ ((and (consp x)
(progn (setq op (qcar x)) t)
(|member| op '(map stream)))
(|objNew| x m1))
@@ -2099,7 +2096,6 @@ It is controlled with the {\tt )se me any} command.
\defun{printTypeAndTimeNormal}{printTypeAndTimeNormal}
\calls{printTypeAndTimeNormal}{qcar}
-\calls{printTypeAndTimeNormal}{pairp}
\calls{printTypeAndTimeNormal}{retract}
\calls{printTypeAndTimeNormal}{objNewWrap}
\calls{printTypeAndTimeNormal}{objMode}
@@ -2122,7 +2118,7 @@ It is controlled with the {\tt )se me any} command.
|$printTimeIfTrue| |$outputLines|
|$interpreterTimedNames| |$interpreterTimedClasses|))
(cond
- ((and (pairp m) (eq (qcar m) '|Union|))
+ ((and (consp m) (eq (qcar m) '|Union|))
(setq xp (|retract| (|objNewWrap| x m)))
(setq mp (|objMode| xp))
(setq m
@@ -2206,14 +2202,14 @@ sameUnionBranch(uArg, m) ==
(defun |sameUnionBranch| (uArg m)
(let (t1 t2 t3)
(cond
- ((and (pairp uArg)
+ ((and (consp uArg)
(eq (qcar uArg) '|:|)
(progn
(setq t1 (qcdr uArg))
- (and (pairp t1)
+ (and (consp t1)
(progn
(setq t2 (qcdr t1))
- (and (pairp t2)
+ (and (consp t2)
(eq (qcdr t2) nil)
(progn (setq t3 (qcar t2)) t))))))
(equal t3 m))
@@ -15962,7 +15958,7 @@ The \verb|$msgdbPrims| variable is set to:
(list '| Value of | (|fixObjectForPrinting| (pname |$op|)) ": (none)"))
(progn
(setq expr (|objValUnwrap| u))
- (if (or (and (pairp expr) (progn (setq op (qcar expr)) t) (eq op 'map))
+ (if (or (and (consp expr) (progn (setq op (qcar expr)) t) (eq op 'map))
(equal (|objMode| u) |$EmptyMode|))
(|displayRule| |$op| expr)
(progn
@@ -16031,7 +16027,6 @@ The \verb|$msgdbPrims| variable is set to:
\calls{displayProperties}{getInterpMacroNames}
\calls{displayProperties}{getParserMacroNames}
\calls{displayProperties}{remdup}
-\calls{displayProperties}{pairp}
\calls{displayProperties}{qcdr}
\calls{displayProperties}{qcar}
\calls{displayProperties}{msort}
@@ -16078,7 +16073,7 @@ The \verb|$msgdbPrims| variable is set to:
(setq pmacs (|getParserMacroNames|))
(setq macros (remdup (append imacs pmacs)))
(when (or
- (and (pairp vl) (eq (qcdr vl) nil) (eq (qcar vl) '|all|))
+ (and (consp vl) (eq (qcdr vl) nil) (eq (qcar vl) '|all|))
(null vl))
(setq vl (msort (append (|getWorkspaceNames|) macros))))
(when |$frameMessages|
@@ -16112,10 +16107,10 @@ The \verb|$msgdbPrims| variable is set to:
(cond
((eq v '|--flags--|)
nil)
- ((and (pairp pl)
+ ((and (consp pl)
(progn
(setq tmp2 (qcar pl))
- (and (pairp tmp2) (eq (qcar tmp2) '|cacheInfo|))))
+ (and (consp tmp2) (eq (qcar tmp2) '|cacheInfo|))))
nil)
(t
(setq vone (|fixObjectForPrinting| v))
@@ -16778,7 +16773,6 @@ we return the remainder of the string without the leading prefix.
\calls{selectOption}{identp}
\calls{selectOption}{stringPrefix?}
\calls{selectOption}{pname}
-\calls{selectOption}{pairp}
\calls{selectOption}{qcdr}
\calls{selectOption}{qcar}
\begin{chunk}{defun selectOption}
@@ -16798,7 +16792,7 @@ we return the remainder of the string without the leading prefix.
(if (|stringPrefix?| (pname x) (pname y))
(setq t0 (cons y t0))))))
(cond
- ((and (pairp u) (eq (qcdr u) nil) (progn (setq y (qcar u)) t)) y)
+ ((and (consp u) (eq (qcdr u) nil) (progn (setq y (qcar u)) t)) y)
(errorfunction (funcall errorfunction x u))
(t nil))))))
@@ -16901,7 +16895,6 @@ o )compile
\calls{abbreviationsSpad2Cmd}{opOf}
\calls{abbreviationsSpad2Cmd}{helpSpad2Cmd}
\calls{abbreviationsSpad2Cmd}{selectOptionLC}
-\calls{abbreviationsSpad2Cmd}{pairp}
\calls{abbreviationsSpad2Cmd}{qcar}
\calls{abbreviationsSpad2Cmd}{qcdr}
\usesdollar{abbreviationsSpad2Cmd}{options}
@@ -16922,7 +16915,7 @@ o )compile
(setq opt (|selectOptionLC| opt '(|quiet|) '|optionError|))
(when (eq opt '|quiet|) (setq quiet t)))
(when
- (and (pairp arg)
+ (and (consp arg)
(progn
(setq opt (qcar arg))
(setq al (qcdr arg))
@@ -17614,7 +17607,6 @@ Clear all the options except the argument.
\calls{clearCmdParts}{assoc}
\calls{clearCmdParts}{isMap}
\calls{clearCmdParts}{get}
-\calls{clearCmdParts}{pairp}
\calls{clearCmdParts}{exit}
\calls{clearCmdParts}{untraceMapSubNames}
\calls{clearCmdParts}{seq}
@@ -17677,7 +17669,7 @@ Clear all the options except the argument.
((setq lm
(|get| x '|localModemap| |$InteractiveFrame|))
(cond
- ((pairp lm)
+ ((consp lm)
(exit (|untraceMapSubNames| (cons (cadar lm) nil))))))
(t nil)))))
(dolist (p2 (cdr p1))
@@ -18334,7 +18326,7 @@ in the Category, Domain, or Package source code.
(flatten (car (getdatabase (fullname cdp) 'documentation)))))))
(let ((|$e| |$EmptyEnvironment|) (opt (second l)))
(declare (special |$e| |$EmptyEnvironment| $describeOptions))
- (if (and (pairp l) (not (eq opt '?)))
+ (if (and (consp l) (not (eq opt '?)))
(describeInternal (first l) (second l))
(|sayMessage|
(append
@@ -18560,7 +18552,6 @@ and tell the user what options are available.
\calls{displaySpad2Cmd}{displayMacros}
\calls{displaySpad2Cmd}{displayWorkspaceNames}
\calls{displaySpad2Cmd}{displayProperties}
-\calls{displaySpad2Cmd}{PAIRP}
\calls{displaySpad2Cmd}{selectOptionLC}
\calls{displaySpad2Cmd}{sayMessage}
\usesdollar{displaySpad2Cmd}{e}
@@ -18570,7 +18561,7 @@ and tell the user what options are available.
(defun displaySpad2Cmd (l)
(let ((|$e| |$EmptyEnvironment|) (opt (car l)) (vl (cdr l)) option)
(declare (special |$e| |$EmptyEnvironment| |$displayOptions|))
- (if (and (pairp l) (not (eq opt '?)))
+ (if (and (consp l) (not (eq opt '?)))
(progn
(setq option (|selectOptionLC| opt |$displayOptions| '|optionError|))
(cond
@@ -19671,7 +19662,6 @@ end of the first.
\calls{frameSpad2Cmd}{throwKeyedMsg}
\calls{frameSpad2Cmd}{helpSpad2Cmd}
\calls{frameSpad2Cmd}{selectOptionLC}
-\calls{frameSpad2Cmd}{pairp}
\calls{frameSpad2Cmd}{qcdr}
\calls{frameSpad2Cmd}{qcar}
\calls{frameSpad2Cmd}{object2Identifier}
@@ -19702,14 +19692,14 @@ end of the first.
(t
(setq arg (|selectOptionLC| (car args) frameArgs '|optionError|))
(setq args (cdr args))
- (when (and (pairp args)
+ (when (and (consp args)
(eq (qcdr args) nil)
(progn (setq a (qcar args)) t))
(setq args a))
(when (atom args) (setq args (|object2Identifier| args)))
(case arg
(|drop|
- (if (and args (pairp args))
+ (if (and args (consp args))
(|throwKeyedMsg| 'S2IZ0017 ; not a valid frame name
(cons args nil))
(|closeInterpreterFrame| args)))
@@ -19717,7 +19707,7 @@ end of the first.
(|last| (|previousInterpreterFrame|))
(|names| (|displayFrameNames|))
(|new|
- (if (and args (pairp args))
+ (if (and args (consp args))
(|throwKeyedMsg| 'S2IZ0017 ; not a valid frame name
(cons args nil))
(|addNewInterpreterFrame| args)))
@@ -20882,7 +20872,6 @@ Also used in the output routines.
\end{chunk}
\defun{restoreHistory}{restoreHistory}
-\calls{restoreHistory}{pairp}
\calls{restoreHistory}{qcdr}
\calls{restoreHistory}{qcar}
\calls{restoreHistory}{identp}
@@ -20917,7 +20906,7 @@ Also used in the output routines.
|$useInternalHistoryTable| |$InteractiveFrame| |$oldHistoryFileName|))
(cond
((null fn) (setq fnq |$oldHistoryFileName|))
- ((and (pairp fn)
+ ((and (consp fn)
(eq (qcdr fn) nil)
(progn
(setq fnq (qcar fn))
@@ -21245,13 +21234,12 @@ RREAD takes erroval to return if key is missing
\end{chunk}
\defun{unwritable?}{unwritable?}
-\calls{unwritable?}{pairp}
\calls{unwritable?}{vecp}
\calls{unwritable?}{placep}
\begin{chunk}{defun unwritable?}
(defun |unwritable?| (ob)
(cond
- ((or (pairp ob) (vecp ob)) nil)
+ ((or (consp ob) (vecp ob)) nil)
((or (compiled-function-p ob) (hash-table-p ob)) t)
((or (placep ob) (readtablep ob)) t)
((floatp ob) t)
@@ -21286,7 +21274,6 @@ back.
\calls{writify,writifyInner}{seq}
\calls{writify,writifyInner}{exit}
\calls{writify,writifyInner}{hget}
-\calls{writify,writifyInner}{pairp}
\calls{writify,writifyInner}{qcar}
\calls{writify,writifyInner}{qcdr}
\calls{writify,writifyInner}{spadClosure?}
@@ -21317,7 +21304,7 @@ back.
(seq
(when (null ob) (exit nil))
(when (setq e (hget |$seen| ob)) (exit e))
- (when (pairp ob)
+ (when (consp ob)
(exit
(seq
(setq qcar (qcar ob))
@@ -21335,18 +21322,18 @@ back.
(exit nob))))
(when
(and
- (and (pairp ob)
+ (and (consp ob)
(eq (qcar ob) 'lambda-closure)
(progn
(setq tmp1 (qcdr ob))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq tmp2 (qcdr tmp1))
(and
- (pairp tmp2)
+ (consp tmp2)
(progn
(setq tmp3 (qcdr tmp2))
- (and (pairp tmp3)
+ (and (consp tmp3)
(progn
(setq x (qcar tmp3))
t)))))))) x)
@@ -21495,7 +21482,6 @@ back.
\calls{dewritify,dewritifyInner}{seq}
\calls{dewritify,dewritifyInner}{exit}
\calls{dewritify,dewritifyInner}{hget}
-\calls{dewritify,dewritifyInner}{pairp}
\calls{dewritify,dewritifyInner}{intp}
\calls{dewritify,dewritifyInner}{gensymmer}
\calls{dewritify,dewritifyInner}{error}
@@ -21528,7 +21514,7 @@ back.
(exit nil))
(when (setq e (hget |$seen| ob))
(exit e))
- (when (and (pairp ob) (eq (car ob) 'writified!!))
+ (when (and (consp ob) (eq (car ob) 'writified!!))
(exit
(seq
(setq type (elt ob 1))
@@ -21620,7 +21606,7 @@ back.
(exit (spaddifference fval)))
(exit fval))))
(exit (|error| "Unknown type to de-writify.")))))
- (when (pairp ob)
+ (when (consp ob)
(exit
(seq
(setq qcar (qcar ob))
@@ -21669,7 +21655,6 @@ back.
\defun{ScanOrPairVec,ScanOrInner}{ScanOrPairVec,ScanOrInner}
\throws{ScanOrPairVec,ScanOrInner}{ScanOrPairVecAnswer}
\calls{ScanOrPairVec,ScanOrInner}{hget}
-\calls{ScanOrPairVec,ScanOrInner}{pairp}
\calls{ScanOrPairVec,ScanOrInner}{hput}
\calls{ScanOrPairVec,ScanOrInner}{ScanOrPairVec,ScanOrInner}
\calls{ScanOrPairVec,ScanOrInner}{qcar}
@@ -21680,7 +21665,7 @@ back.
(defun |ScanOrPairVec,ScanOrInner| (f ob)
(declare (special |$seen|))
(when (hget |$seen| ob) nil)
- (when (pairp ob)
+ (when (consp ob)
(hput |$seen| ob t)
(|ScanOrPairVec,ScanOrInner| f (qcar ob))
(|ScanOrPairVec,ScanOrInner| f (qcdr ob)))
@@ -22712,7 +22697,6 @@ explanations see the list structure section \ref{Theliststructure}.
\calls{displaySetVariableSettings}{say}
\calls{displaySetVariableSettings}{fillerSpaces}
\calls{displaySetVariableSettings}{specialChar}
-\calls{displaySetVariableSettings}{pairp}
\calls{displaySetVariableSettings}{concat}
\calls{displaySetVariableSettings}{satisfiesUserLevel}
\calls{displaySetVariableSettings}{spaddifference}
@@ -22756,7 +22740,7 @@ explanations see the list structure section \ref{Theliststructure}.
(funcall (fifth setdata) '|%display%|)
"unimplemented"))
(cond
- ((pairp opt)
+ ((consp opt)
(setq opt
(do ((t2 opt (cdr t2)) t1 (o nil))
((or (atom t2) (progn (setq o (car t2)) nil)) t1)
@@ -23098,7 +23082,6 @@ The input-libraries and output-library are now truename based.
\defunsec{setInputLibrary}{The set input library command handler}
The input-libraries is now maintained as a list of truenames.
\calls{setInputLibrary}{describeInputLibraryArgs}
-\calls{setInputLibrary}{pairp}
\calls{setInputLibrary}{qcar}
\calls{setInputLibrary}{qcdr}
\calls{setInputLibrary}{selectOptionLC}
@@ -23116,11 +23099,11 @@ The input-libraries is now maintained as a list of truenames.
((eq arg '|%display%|) (mapcar #'namestring input-libraries))
((or (null arg) (eq arg '|%describe%|) (eq (car arg) '?))
(|describeInputLibraryArgs|))
- ((and (pairp arg)
+ ((and (consp arg)
(progn
(setq act (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn (setq filename (qcar tmp1)) t)))
(setq act (|selectOptionLC| act '(|add| |drop|) nil)))
@@ -24541,7 +24524,6 @@ otherwise the new algebra won't be loaded by the interpreter when needed.
\calls{setExpose}{sayKeyedMsg}
\calls{setExpose}{namestring}
\calls{setExpose}{pathname}
-\calls{setExpose}{pairp}
\calls{setExpose}{qcar}
\calls{setExpose}{qcdr}
\calls{setExpose}{selectOptionLC}
@@ -24562,7 +24544,7 @@ otherwise the new algebra won't be loaded by the interpreter when needed.
(|sayMSG| " ")
(|displayHiddenConstructors|)
(|sayMSG| " "))
- ((and (pairp arg)
+ ((and (consp arg)
(progn (setq fn (qcar arg)) (setq fnargs (qcdr arg)) t)
(setq fn (|selectOptionLC| fn '(|add| |drop|) nil)))
(cond
@@ -24580,7 +24562,6 @@ otherwise the new algebra won't be loaded by the interpreter when needed.
\calls{setExposeAdd}{sayMSG}
\calls{setExposeAdd}{displayExposedConstructors}
\calls{setExposeAdd}{sayKeyedMsg}
-\calls{setExposeAdd}{pairp}
\calls{setExposeAdd}{qcar}
\calls{setExposeAdd}{qcdr}
\calls{setExposeAdd}{selectOptionLC}
@@ -24602,7 +24583,7 @@ otherwise the new algebra won't be loaded by the interpreter when needed.
(|displayExposedConstructors|)
(|sayMSG| " ")
(|sayKeyedMsg| 's2iz0049e nil))
- ((and (pairp arg)
+ ((and (consp arg)
(progn (setq fn (qcar arg)) (setq fnargs (qcdr arg)) t)
(setq fn (|selectOptionLC| fn '(|group| |constructor|) nil)))
(cond
@@ -24617,7 +24598,6 @@ otherwise the new algebra won't be loaded by the interpreter when needed.
Note that \verb|$localExposureData| is a vector of lists.
It consists of [exposed groups,exposed constructors,hidden constructors]
\calls{setExposeAddGroup}{object2String}
-\calls{setExposeAddGroup}{pairp}
\calls{setExposeAddGroup}{qcar}
\calls{setExposeAddGroup}{setelt}
\calls{setExposeAddGroup}{displayExposedGroups}
@@ -24653,7 +24633,7 @@ It consists of [exposed groups,exposed constructors,hidden constructors]
(mapcar #'(lambda (x) (|object2String| (first x)))
|$globalExposureGroupAlist|)))
(dolist (x arg)
- (when (pairp x) (setq x (qcar x)))
+ (when (consp x) (setq x (qcar x)))
(cond
((eq x '|all|)
(setelt |$localExposureData| 0
@@ -24680,7 +24660,6 @@ It consists of [exposed groups,exposed constructors,hidden constructors]
\defunsec{setExposeAddConstr}{The top level set expose add constructor handler}
\calls{setExposeAddConstr}{unabbrev}
-\calls{setExposeAddConstr}{pairp}
\calls{setExposeAddConstr}{qcar}
\calls{setExposeAddConstr}{getdatabase}
\calls{setExposeAddConstr}{sayKeyedMsg}
@@ -24706,7 +24685,7 @@ It consists of [exposed groups,exposed constructors,hidden constructors]
(|displayExposedConstructors|))
(dolist (x arg)
(setq x (|unabbrev| x))
- (when (pairp x) (setq x (qcar x)))
+ (when (consp x) (setq x (qcar x)))
(cond
((null (getdatabase x 'constructorkind))
(|sayKeyedMsg| 's2iz0049j (list x)))
@@ -24729,7 +24708,6 @@ It consists of [exposed groups,exposed constructors,hidden constructors]
\calls{setExposeDrop}{displayHiddenConstructors}
\calls{setExposeDrop}{sayMSG}
\calls{setExposeDrop}{sayKeyedMsg}
-\calls{setExposeDrop}{pairp}
\calls{setExposeDrop}{qcar}
\calls{setExposeDrop}{qcdr}
\calls{setExposeDrop}{selectOptionLC}
@@ -24749,7 +24727,7 @@ It consists of [exposed groups,exposed constructors,hidden constructors]
(|displayHiddenConstructors|)
(|sayMSG| " ")
(|sayKeyedMsg| 's2iz0049f nil))
- ((and (pairp arg)
+ ((and (consp arg)
(progn (setq fn (qcar arg)) (setq fnargs (qcdr arg)) t)
(setq fn (|selectOptionLC| fn '(|group| |constructor|) nil)))
(cond
@@ -24761,7 +24739,6 @@ It consists of [exposed groups,exposed constructors,hidden constructors]
\end{chunk}
\defunsec{setExposeDropGroup}{The top level set expose drop group handler}
-\calls{setExposeDropGroup}{pairp}
\calls{setExposeDropGroup}{qcar}
\calls{setExposeDropGroup}{setelt}
\calls{setExposeDropGroup}{displayExposedGroups}
@@ -24792,7 +24769,7 @@ It consists of [exposed groups,exposed constructors,hidden constructors]
(|sayMSG| " ")
(|displayExposedGroups|))
(dolist (x arg)
- (when (pairp x) (setq x (qcar x)))
+ (when (consp x) (setq x (qcar x)))
(cond
((eq x '|all|)
(setelt |$localExposureData| 0 nil)
@@ -24817,7 +24794,6 @@ It consists of [exposed groups,exposed constructors,hidden constructors]
\defunsec{setExposeDropConstr}
{The top level set expose drop constructor handler}
\calls{setExposeDropConstr}{unabbrev}
-\calls{setExposeDropConstr}{pairp}
\calls{setExposeDropConstr}{qcar}
\calls{setExposeDropConstr}{getdatabase}
\calls{setExposeDropConstr}{sayKeyedMsg}
@@ -24849,7 +24825,7 @@ It consists of [exposed groups,exposed constructors,hidden constructors]
(|displayHiddenConstructors|))
(dolist (x arg)
(setq x (|unabbrev| x))
- (when (pairp x) (setq x (qcar x)))
+ (when (consp x) (setq x (qcar x)))
(cond
((null (getdatabase x 'constructorkind))
(|sayKeyedMsg| 's2iz0049j (list x)))
@@ -25022,7 +24998,6 @@ recurrence specially compile recurrence relations on
\end{chunk}
\defunsec{countCache}{Display a particular cache count}
-\calls{countCache}{pairp}
\calls{countCache}{qcdr}
\calls{countCache}{qcar}
\calls{countCache}{identp}
@@ -25042,11 +25017,11 @@ recurrence specially compile recurrence relations on
(cond
(|$options|
(cond
- ((and (pairp |$options|)
+ ((and (consp |$options|)
(eq (qcdr |$options|) nil)
(progn
(setq tmp1 (qcar |$options|))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcar tmp1) '|vars|)
(progn (setq l (qcdr tmp1)) t))))
(dolist (x l)
@@ -27254,7 +27229,6 @@ The current setting is: On:CONSOLE
\calls{setOutputAlgebra}{defiostream}
\calls{setOutputAlgebra}{concat}
\calls{setOutputAlgebra}{describeSetOutputAlgebra}
-\calls{setOutputAlgebra}{pairp}
\calls{setOutputAlgebra}{qcdr}
\calls{setOutputAlgebra}{qcar}
\calls{setOutputAlgebra}{member}
@@ -27291,7 +27265,7 @@ The current setting is: On:CONSOLE
(|describeSetOutputAlgebra|))
(t
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t)
(|member| fn '(y n ye yes no o on of off console
@@ -27299,7 +27273,7 @@ The current setting is: On:CONSOLE
'|ok|)
(t (setq arg (list fn '|spout|))))
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t))
(cond
@@ -27313,20 +27287,20 @@ The current setting is: On:CONSOLE
(defiostream '((mode . output) (device . console)) 255 0))
(setq |$algebraOutputFile| "CONSOLE"))))
((or
- (and (pairp arg)
+ (and (consp arg)
(progn
(setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn (setq ft (qcar tmp1)) t))))
- (and (pairp arg)
+ (and (consp arg)
(progn (setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn (setq ft (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn
(setq fm (qcar tmp2))
@@ -27437,7 +27411,6 @@ The current setting is: On:CONSOLE
\calls{setOutputCharacters}{pname}
\calls{setOutputCharacters}{specialChar}
\calls{setOutputCharacters}{sayAsManyPerLineAsPossible}
-\calls{setOutputCharacters}{pairp}
\calls{setOutputCharacters}{qcdr}
\calls{setOutputCharacters}{qcar}
\calls{setOutputCharacters}{downcase}
@@ -27485,7 +27458,7 @@ The current setting is: On:CONSOLE
(pname (|specialChar| char))))
(setq l (cons s l)))
(|sayAsManyPerLineAsPossible| (reverse l)))
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) NIL)
(progn (setq fn (qcar arg)) t)
(setq fn (downcase fn)))
@@ -27570,7 +27543,6 @@ The current setting is: Off:CONSOLE
\calls{setOutputFortran}{concat}
\calls{setOutputFortran}{describeSetOutputFortran}
\calls{setOutputFortran}{upcase}
-\calls{setOutputFortran}{pairp}
\calls{setOutputFortran}{qcdr}
\calls{setOutputFortran}{qcar}
\calls{setOutputFortran}{member}
@@ -27615,7 +27587,7 @@ The current setting is: Off:CONSOLE
(t nil))
(setq arg (cdr arg)))
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t)
(|member| fn '(Y N YE YES NO O ON OF OFF CONSOLE
@@ -27623,7 +27595,7 @@ The current setting is: Off:CONSOLE
'|ok|)
(t (setq arg (list fn '|sfort|))))
(cond
- ((and (pairp arg) (eq (qcdr arg) nil) (progn (setq fn (qcar arg)) t))
+ ((and (consp arg) (eq (qcdr arg) nil) (progn (setq fn (qcar arg)) t))
(cond
((|member| (upcase fn) '(y n ye o of))
(|sayKeyedMsg| 's2iv0002 '(fortran |fortran|)))
@@ -27635,22 +27607,22 @@ The current setting is: Off:CONSOLE
(defiostream '((mode . output) (device . console)) 255 0))
(setq |$fortranOutputFile| "CONSOLE"))))
((or
- (and (pairp arg)
+ (and (consp arg)
(progn
(setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn (setq ft (qcar tmp1)) t))))
- (and (pairp arg)
+ (and (consp arg)
(progn
(setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq ft (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn (setq fm (qcar tmp2)) t)))))))
(when (setq ptype (|pathnameType| fn))
@@ -27847,7 +27819,6 @@ The current setting is: Off:CONSOLE
\calls{setOutputMathml}{defiostream}
\calls{setOutputMathml}{concat}
\calls{setOutputMathml}{describeSetOutputMathml}
-\calls{setOutputMathml}{pairp}
\calls{setOutputMathml}{qcdr}
\calls{setOutputMathml}{qcar}
\calls{setOutputMathml}{member}
@@ -27884,7 +27855,7 @@ The current setting is: Off:CONSOLE
(|describeSetOutputMathml|))
(t
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t)
(|member| fn '(y n ye yes no o on of off console
@@ -27892,7 +27863,7 @@ The current setting is: Off:CONSOLE
'|ok|)
(t (setq arg (list fn '|smml|))))
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t))
(cond
@@ -27906,21 +27877,21 @@ The current setting is: Off:CONSOLE
(defiostream '((mode . output) (device . console)) 255 0))
(setq |$mathmlOutputFile| "CONSOLE"))))
((or
- (and (pairp arg)
+ (and (consp arg)
(progn
(setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn (setq ft (qcar tmp1)) t))))
- (and (pairp arg)
+ (and (consp arg)
(progn (setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq ft (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn
(setq fm (qcar tmp2))
@@ -28051,7 +28022,6 @@ The current setting is: Off:CONSOLE
\calls{setOutputHtml}{defiostream}
\calls{setOutputHtml}{concat}
\calls{setOutputHtml}{describeSetOutputHtml}
-\calls{setOutputHtml}{pairp}
\calls{setOutputHtml}{qcdr}
\calls{setOutputHtml}{qcar}
\calls{setOutputHtml}{member}
@@ -28088,7 +28058,7 @@ The current setting is: Off:CONSOLE
(|describeSetOutputHtml|))
(t
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t)
(|member| fn '(y n ye yes no o on of off console
@@ -28096,7 +28066,7 @@ The current setting is: Off:CONSOLE
'|ok|)
(t (setq arg (list fn '|smml|))))
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t))
(cond
@@ -28110,21 +28080,21 @@ The current setting is: Off:CONSOLE
(defiostream '((mode . output) (device . console)) 255 0))
(setq |$htmlOutputFile| "CONSOLE"))))
((or
- (and (pairp arg)
+ (and (consp arg)
(progn
(setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn (setq ft (qcar tmp1)) t))))
- (and (pairp arg)
+ (and (consp arg)
(progn (setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq ft (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn
(setq fm (qcar tmp2))
@@ -28255,7 +28225,6 @@ The current setting is: Off:CONSOLE
\calls{setOutputOpenMath}{defiostream}
\calls{setOutputOpenMath}{concat}
\calls{setOutputOpenMath}{describeSetOutputOpenMath}
-\calls{setOutputOpenMath}{pairp}
\calls{setOutputOpenMath}{qcdr}
\calls{setOutputOpenMath}{qcar}
\calls{setOutputOpenMath}{member}
@@ -28292,7 +28261,7 @@ The current setting is: Off:CONSOLE
(|describeSetOutputOpenMath|))
(t
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t)
(|member| fn '(y n ye yes no o on of off console
@@ -28300,7 +28269,7 @@ The current setting is: Off:CONSOLE
'|ok|)
(t (setq arg (list fn '|som|))))
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t))
(cond
@@ -28314,20 +28283,20 @@ The current setting is: Off:CONSOLE
(defiostream '((mode . output) (device . console)) 255 0))
(setq |$openMathOutputFile| "CONSOLE"))))
((or
- (and (pairp arg)
+ (and (consp arg)
(progn (setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn (setq ft (qcar tmp1)) t))))
- (and (pairp arg)
+ (and (consp arg)
(progn
(setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn (setq ft (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn (setq fm (qcar tmp2)) t)))))))
(when (setq ptype (|pathnameType| fn))
@@ -28460,7 +28429,6 @@ The current setting is: Off:CONSOLE
\calls{setOutputFormula}{defiostream}
\calls{setOutputFormula}{concat}
\calls{setOutputFormula}{describeSetOutputFormula}
-\calls{setOutputFormula}{pairp}
\calls{setOutputFormula}{qcdr}
\calls{setOutputFormula}{qcar}
\calls{setOutputFormula}{member}
@@ -28497,7 +28465,7 @@ The current setting is: Off:CONSOLE
(|describeSetOutputFormula|))
(t
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t)
(|member| fn '(y n ye yes no o on of off console
@@ -28505,7 +28473,7 @@ The current setting is: Off:CONSOLE
'|ok|)
(t (setq arg (list fn '|sform|))))
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t))
(cond
@@ -28519,19 +28487,19 @@ The current setting is: Off:CONSOLE
(defiostream '((mode . output) (device . console)) 255 0))
(setq |$formulaOutputFile| "CONSOLE"))))
((or
- (and (pairp arg)
+ (and (consp arg)
(progn (setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn (setq ft (qcar tmp1)) t))))
- (and (pairp arg)
+ (and (consp arg)
(progn (setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn (setq ft (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn
(setq fm (qcar tmp2)) t)))))))
@@ -28723,7 +28691,6 @@ The current setting is: Off:CONSOLE
\calls{setOutputTex}{defiostream}
\calls{setOutputTex}{concat}
\calls{setOutputTex}{describeSetOutputTex}
-\calls{setOutputTex}{pairp}
\calls{setOutputTex}{qcdr}
\calls{setOutputTex}{qcar}
\calls{setOutputTex}{member}
@@ -28759,7 +28726,7 @@ The current setting is: Off:CONSOLE
(|describeSetOutputTex|))
(t
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t)
(|member| fn '(y n ye yes no o on of off console
@@ -28767,7 +28734,7 @@ The current setting is: Off:CONSOLE
'|ok|)
(t (setq arg (list fn '|stex| nil))))
(cond
- ((and (pairp arg)
+ ((and (consp arg)
(eq (qcdr arg) nil)
(progn (setq fn (qcar arg)) t))
(cond
@@ -28781,19 +28748,19 @@ The current setting is: Off:CONSOLE
(defiostream '((mode . output) (device . console)) 255 0))
(setq |$texOutputFile| "CONSOLE"))))
((or
- (and (pairp arg)
+ (and (consp arg)
(progn (setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn (setq ft (qcar tmp1)) t))))
- (and (pairp arg)
+ (and (consp arg)
(progn (setq fn (qcar arg))
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn (setq ft (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn (setq fm (qcar tmp2)) t)))))))
(when (setq ptype (|pathnameType| fn))
@@ -29436,7 +29403,7 @@ o )what
(setq |$e| |$InteractiveFrame|)
(setq |$env| |$InteractiveFrame|)
(cond
- ((and (pairp arg) (eq (qcdr arg) nil) (progn (setq constr (qcar arg)) t))
+ ((and (consp arg) (eq (qcdr arg) nil) (progn (setq constr (qcar arg)) t))
(cond
((|member| constr '(|Union| |Record| |Mapping|))
(cond
@@ -29449,7 +29416,7 @@ o )what
(list constr ")show Union(a: Integer, b: String)" )))
(|sayKeyedMsg| 'S2IZ0045U
(list constr ")show Union(Integer, String)" ))))
- ((and (pairp constr) (eq (qcar constr) '|Mapping|))
+ ((and (consp constr) (eq (qcar constr) '|Mapping|))
(|sayKeyedMsg| 'S2IZ0044M nil))
(t (|reportOperations| constr constr))))
(t (|reportOperations| arg arg)))))))
@@ -29494,14 +29461,14 @@ o )what
((eq u '%)
(|sayKeyedMsg| 'S2IZ0063 nil)
(|sayKeyedMsg| 'S2IZ0064 nil))
- ((and (null (and (pairp u) (eq (qcar u) '|Record|)))
- (null (and (pairp u) (eq (qcar u) '|Union|)))
+ ((and (null (and (consp u) (eq (qcar u) '|Record|)))
+ (null (and (consp u) (eq (qcar u) '|Union|)))
(null (|isNameOfType| u))
- (null (and (pairp u)
+ (null (and (consp u)
(eq (qcar u) '|typeOf|)
(progn
(setq tmp1 (qcdr u))
- (and (pairp tmp1) (eq (qcdr tmp1) nil))))))
+ (and (consp tmp1) (eq (qcdr tmp1) nil))))))
(when (atom oldArg) (setq oldArg (list oldArg)))
(|sayKeyedMsg| 'S2IZ0063 nil)
(dolist (op oldArg)
@@ -29756,7 +29723,7 @@ o )what
(declare (special |$commentedOps| |$CategoryFrame| $linelength |$options|
|$showOptions|))
(setq isRecordOrUnion
- (and (pairp unitForm)
+ (and (consp unitForm)
(progn (setq a (qcar unitForm)) t)
(|member| a '(|Record| |Union|))))
(setq unit (|evalDomain| unitForm))
@@ -30497,7 +30464,6 @@ This reports the traced functions
\end{chunk}
\defun{traceSpad2Cmd}{traceSpad2Cmd}
-\calls{traceSpad2Cmd}{pairp}
\calls{traceSpad2Cmd}{qcar}
\calls{traceSpad2Cmd}{qcdr}
\calls{traceSpad2Cmd}{getMapSubNames}
@@ -30510,11 +30476,11 @@ This reports the traced functions
(let (tmp1 l1)
(declare (special |$mapSubNameAlist|))
(cond
- ((and (pairp l)
+ ((and (consp l)
(eq (qcar l) '|Tuple|)
(progn
(setq tmp1 (qcdr l))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn
(setq l1 (qcar tmp1))
@@ -30544,7 +30510,6 @@ This reports the traced functions
\calls{trace1}{resetSpacers}
\calls{trace1}{resetTimers}
\calls{trace1}{resetCounters}
-\calls{trace1}{pairp}
\calls{trace1}{qcar}
\calls{trace1}{qcdr}
\calls{trace1}{vecp}
@@ -30637,7 +30602,7 @@ This reports the traced functions
(|trace1| oldl)
(progn
(dolist (x arg)
- (if (and (pairp x)
+ (if (and (consp x)
(progn
(setq domain (qcar x))
(setq oplist (qcdr x))
@@ -30648,7 +30613,7 @@ This reports the traced functions
(setq |$options| (append newoptions (lassoc x |$optionAlist|)))
(|trace1| (list x)))))))))
((null arg) nil)
- ((and (pairp arg) (eq (qcdr arg) nil) (eq (qcar arg) '?)) (|?t|))
+ ((and (consp arg) (eq (qcdr arg) nil) (eq (qcar arg) '?)) (|?t|))
(t
(setq tracelist
(or
@@ -30820,7 +30785,6 @@ This reports the traced functions
\calls{getTraceOption}{concat}
\calls{getTraceOption}{object2String}
\calls{getTraceOption}{transOnlyOption}
-\calls{getTraceOption}{pairp}
\calls{getTraceOption}{qcdr}
\calls{getTraceOption}{qcar}
\calls{getTraceOption}{getTraceOption,hn}
@@ -30881,7 +30845,7 @@ This reports the traced functions
((eq key '|only|) (cons '|only| (|transOnlyOption| l)))
((eq key '|within|)
(cond
- ((and (pairp l)
+ ((and (consp l)
(eq (qcdr l) nil)
(progn (setq a (qcar l)) t)
(identp a))
@@ -30895,7 +30859,7 @@ This reports the traced functions
((eq key '|cond|) '|when|)
(t key)))
(cond
- ((and (pairp l)
+ ((and (consp l)
(eq (qcdr l) nil)
(progn (setq a (qcar l)) t))
(cons key l))
@@ -30907,7 +30871,7 @@ This reports the traced functions
(|object2String| key)) nil) nil))))))
((eq key '|depth|)
(cond
- ((and (pairp l)
+ ((and (consp l)
(eq (qcdr l) nil)
(progn (setq |n| (qcar l)) t)
(integerp |n|))
@@ -30918,7 +30882,7 @@ This reports the traced functions
((eq key '|count|)
(cond
((or (null l)
- (and (pairp l)
+ (and (consp l)
(eq (qcdr l) nil)
(progn (setq |n| (qcar l)) t)
(integerp |n|)))
@@ -30939,7 +30903,7 @@ This reports the traced functions
((member key '(|local| ops |vars|))
(cond
((or (null l)
- (and (pairp l) (eq (qcdr l) nil) (eq (qcar l) '|all|)))
+ (and (consp l) (eq (qcdr l) nil) (eq (qcar l) '|all|)))
(cons key '|all|))
((|isListOfIdentifiersOrStrings| l) arg)
(t
@@ -30950,7 +30914,7 @@ This reports the traced functions
((eq key '|varbreak|)
(cond
((or (null l)
- (and (pairp l) (eq (qcdr l) nil) (eq (qcar l) '|all|)))
+ (and (consp l) (eq (qcdr l) nil) (eq (qcar l) '|all|)))
(cons '|varbreak| '|all|))
((|isListOfIdentifiers| l) arg)
(t
@@ -31071,13 +31035,12 @@ This reports the traced functions
\calls{transOnlyOption}{transOnlyOption}
\calls{transOnlyOption}{upcase}
\calls{transOnlyOption}{stackTraceOptionError}
-\calls{transOnlyOption}{pairp}
\calls{transOnlyOption}{qcar}
\calls{transOnlyOption}{qcdr}
\begin{chunk}{defun transOnlyOption}
(defun |transOnlyOption| (arg)
(let (y n)
- (when (and (pairp arg) (progn (setq n (qcar arg)) (setq y (qcdr arg)) t))
+ (when (and (consp arg) (progn (setq n (qcar arg)) (setq y (qcdr arg)) t))
(cond
((integerp n) (cons n (|transOnlyOption| y)))
((member (setq n (upcase n)) '(v a c)) (cons n (|transOnlyOption| y)))
@@ -31187,7 +31150,6 @@ This reports the traced functions
\calls{transTraceItem}{domainToGenvar}
\calls{transTraceItem}{unabbrev}
\calls{transTraceItem}{constructor?}
-\calls{transTraceItem}{pairp}
\calls{transTraceItem}{vecp}
\calls{transTraceItem}{transTraceItem}
\calls{transTraceItem}{devaluate}
@@ -31214,7 +31176,7 @@ This reports the traced functions
(setq y (|unabbrev| x))
(cond
((|constructor?| y) y)
- ((and (pairp y) (|constructor?| (car y))) (car y))
+ ((and (consp y) (|constructor?| (car y))) (car y))
((setq y (|domainToGenvar| x)) y)
(t x)))
(t x)))
@@ -31604,7 +31566,6 @@ This reports the traced functions
\end{chunk}
\defun{funfind,LAM}{funfind,LAM}
-\calls{funfind,LAM}{pairp}
\calls{funfind,LAM}{qcar}
\calls{funfind,LAM}{SEQ}
\calls{funfind,LAM}{isFunctor}
@@ -31624,10 +31585,10 @@ This reports the traced functions
(seq
(exit
(cond
- ((and (pairp u)
+ ((and (consp u)
(progn
(setq tmp1 (qcar u))
- (and (pairp tmp1) (equal (qcar tmp1) opname))))
+ (and (consp tmp1) (equal (qcar tmp1) opname))))
(setq t0 (cons u t0))))))))))))))
\end{chunk}
@@ -31699,7 +31660,6 @@ This reports the traced functions
\end{chunk}
\defun{spadTrace}{spadTrace}
-\calls{spadTrace}{pairp}
\calls{spadTrace}{refvecp}
\calls{spadTrace}{aldorTrace}
\calls{spadTrace}{isDomainOrPackage}
@@ -31743,7 +31703,7 @@ This reports the traced functions
(setq |$fromSpadTrace| t)
(setq |$tracedModemap| nil)
(cond
- ((and (pairp domain)
+ ((and (consp domain)
(refvecp (car domain))
(eql (elt (car domain) 0) 0))
(|aldorTrace| domain options))
@@ -31965,7 +31925,6 @@ This reports the traced functions
\defun{untraceDomainConstructor,keepTraced?}{%
untraceDomainConstructor,keepTraced?}
\calls{untraceDomainConstructor,keepTraced?}{seq}
-\calls{untraceDomainConstructor,keepTraced?}{pairp}
\calls{untraceDomainConstructor,keepTraced?}{qcar}
\calls{untraceDomainConstructor,keepTraced?}{isDomainOrPackage}
\calls{untraceDomainConstructor,keepTraced?}{boot-equal}
@@ -31980,7 +31939,7 @@ untraceDomainConstructor,keepTraced?}
(seq
(if (and
(and
- (and (pairp df) (progn (setq dc (qcar df)) t))
+ (and (consp df) (progn (setq dc (qcar df)) t))
(|isDomainOrPackage| dc))
(boot-equal (kar (|devaluate| dc)) domainConstructor))
(exit (seq (|/UNTRACE,0| (cons dc nil)) (exit nil))))
@@ -32327,7 +32286,6 @@ to convert the data into type "Expression"
\end{chunk}
\defun{hasPair}{hasPair}
-\calls{hasPair}{pairp}
\calls{hasPair}{qcar}
\calls{hasPair}{qcdr}
\calls{hasPair}{hasPair}
@@ -32337,10 +32295,10 @@ to convert the data into type "Expression"
(return
(cond
((atom arg) nil)
- ((and (pairp arg)
+ ((and (consp arg)
(progn
(setq tmp1 (qcar arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(equal (qcar tmp1) key)
(progn (setq a (qcdr tmp1)) t))))
a)
@@ -32377,7 +32335,6 @@ to convert the data into type "Expression"
\end{chunk}
\defun{reportSpadTrace}{reportSpadTrace}
-\calls{reportSpadTrace}{pairp}
\calls{reportSpadTrace}{qcar}
\calls{reportSpadTrace}{sayBrightly}
\usesdollar{reportSpadTrace}{traceNoisely}
@@ -32408,7 +32365,7 @@ to convert the data into type "Expression"
(setq |namePart| nil)
(setq |tracePart|
(cond
- ((and (pairp |t|) (progn (setq y (qcar |t|)) t) (null (null y)))
+ ((and (consp |t|) (progn (setq y (qcar |t|)) t) (null (null y)))
(cond
((eq y '|all|)
(cons '|%b| (cons '|all| (cons '|%d| (cons '|vars| nil)))))
@@ -32445,7 +32402,6 @@ to convert the data into type "Expression"
\end{chunk}
\defun{/tracereply}{/tracereply}
-\calls{/tracereply}{pairp}
\calls{/tracereply}{qcar}
\calls{/tracereply}{isDomainOrPackage}
\calls{/tracereply}{devaluate}
@@ -32466,7 +32422,7 @@ to convert the data into type "Expression"
(seq
(exit
(cond
- ((and (pairp x)
+ ((and (consp x)
(progn (setq |d| (qcar x)) t)
(|isDomainOrPackage| |d|))
(setq domainlist (cons (|devaluate| |d|) domainlist)))
@@ -32479,7 +32435,6 @@ to convert the data into type "Expression"
\defun{spadReply,printName}{spadReply,printName}
\calls{spadReply,printName}{seq}
-\calls{spadReply,printName}{pairp}
\calls{spadReply,printName}{qcar}
\calls{spadReply,printName}{isDomainOrPackage}
\calls{spadReply,printName}{exit}
@@ -32489,7 +32444,7 @@ to convert the data into type "Expression"
(prog (|d|)
(return
(seq
- (if (and (and (pairp x) (progn (setq |d| (qcar x)) t))
+ (if (and (and (consp x) (progn (setq |d| (qcar x)) t))
(|isDomainOrPackage| |d|))
(exit (|devaluate| |d|)))
(exit x)))))
@@ -32617,7 +32572,7 @@ to convert the data into type "Expression"
\begin{chunk}{defun remover}
(defun remover (lst item)
(cond
- ((null (pairp lst)) (cond ((equal lst item) nil) (t lst)))
+ ((null (consp lst)) (cond ((equal lst item) nil) (t lst)))
((equal (car lst) item) (cdr lst))
(t (rplnode lst (remover (car lst) item) (remover (cdr lst) item)))))
@@ -32625,7 +32580,6 @@ to convert the data into type "Expression"
\defun{prTraceNames,fn}{prTraceNames,fn}
\calls{prTraceNames,fn}{seq}
-\calls{prTraceNames,fn}{pairp}
\calls{prTraceNames,fn}{qcar}
\calls{prTraceNames,fn}{qcdr}
\calls{prTraceNames,fn}{isDomainOrPackage}
@@ -32636,7 +32590,7 @@ to convert the data into type "Expression"
(prog (|d| |t|)
(return
(seq
- (if (and (and (pairp x)
+ (if (and (and (consp x)
(progn (setq |d| (qcar x)) (setq |t| (qcdr x)) t))
(|isDomainOrPackage| |d|))
(exit (cons (|devaluate| |d|) |t|)))
@@ -32671,7 +32625,6 @@ to convert the data into type "Expression"
\defun{traceReply}{traceReply}
\calls{traceReply}{sayMessage}
\calls{traceReply}{sayBrightly}
-\calls{traceReply}{pairp}
\calls{traceReply}{qcar}
\calls{traceReply}{isDomainOrPackage}
\calls{traceReply}{addTraceItem}
@@ -32715,7 +32668,7 @@ to convert the data into type "Expression"
(seq
(exit
(cond
- ((and (pairp x)
+ ((and (consp x)
(progn (setq |d| (qcar x)) t) (|isDomainOrPackage| |d|))
(|addTraceItem| |d|))
((atom x)
@@ -32835,7 +32788,6 @@ to convert the data into type "Expression"
\calls{?t}{sayMSG}
\calls{?t}{bright}
\calls{?t}{rassocSub}
-\calls{?t}{pairp}
\calls{?t}{qcar}
\calls{?t}{qcdr}
\calls{?t}{isDomainOrPackage}
@@ -32866,7 +32818,7 @@ to convert the data into type "Expression"
"traced"))))))
(dolist (x /tracenames)
(cond
- ((and (pairp x)
+ ((and (consp x)
(progn (setq d (qcar x)) (setq l (qcdr x)) t)
(|isDomainOrPackage| d))
(progn
@@ -33231,7 +33183,6 @@ alternate polynomial types of Symbols.
\end{chunk}
\defun{mkEvalable}{mkEvalable}
-\calls{mkEvalable}{pairp}
\calls{mkEvalable}{qcar}
\calls{mkEvalable}{qcdr}
\calls{mkEvalable}{mkEvalable}
@@ -33252,7 +33203,7 @@ alternate polynomial types of Symbols.
(let (op argl kind cosig tmp1 y)
(declare (special |$Integer| |$EmptyMode|))
(cond
- ((pairp form)
+ ((consp form)
(setq op (qcar form))
(setq argl (qcdr form))
(cond
@@ -33278,8 +33229,8 @@ alternate polynomial types of Symbols.
(t
(|loadIfNecessary| x)
(|mkEvalable| x))))
- ((and (pairp x) (eq (qcar x) 'quote)) x)
- ((and (pairp x) (eq (qcar x) '|#|) (pairp (qcdr x))
+ ((and (consp x) (eq (qcar x) 'quote)) x)
+ ((and (consp x) (eq (qcar x) '|#|) (consp (qcdr x))
(eq (qcdr (qcdr x)) nil))
(list 'size (mkq (qcar (qcdr x)))))
(t (mkq x))))))
@@ -33341,7 +33292,6 @@ on non-type valued arguemnts to the constructor
and finally checking to see whether the type satisfies the
conditions of its modemap
\calls{evaluateType}{isDomainValuedVariable}
-\calls{evaluateType}{pairp}
\calls{evaluateType}{qcar}
\calls{evaluateType}{qcdr}
\calls{evaluateType}{mkAtree}
@@ -33368,18 +33318,18 @@ conditions of its modemap
(t
(setq |$expandSegments| nil)
(cond
- ((and (pairp form) (eq (qcar form) '|typeOf|) (pairp (qcdr form))
+ ((and (consp form) (eq (qcar form) '|typeOf|) (consp (qcdr form))
(eq (qcdr (qcdr form)) nil))
(setq formp (|mkAtree| form))
(|bottomUp| formp)
(|objVal| (|getValue| formp)))
- ((pairp form)
+ ((consp form)
(setq op (qcar form))
(setq argl (qcdr form))
(cond
((eq op 'category)
(cond
- ((pairp argl)
+ ((consp argl)
(cons op
(cons (qcar argl)
(loop for s in (qcdr argl)
@@ -33391,8 +33341,8 @@ conditions of its modemap
collect (|evaluateType| arg))))
((eq op '|Union|)
(cond
- ((and argl (pairp (car argl)) (pairp (qcdr (car argl)))
- (pairp (qcdr (qcdr (car argl))))
+ ((and argl (consp (car argl)) (consp (qcdr (car argl)))
+ (consp (qcdr (qcdr (car argl))))
(eq (qcdr (qcdr (qcdr (car argl)))) nil)
(|member| (qcar (car argl)) '(|:| |Declare|)))
(cons op
@@ -33432,7 +33382,6 @@ Evaluates the arguments passed to a constructor
\calls{evaluateType1}{mkAtree}
\calls{evaluateType1}{putTarget}
\calls{evaluateType1}{bottumUp}
-\calls{evaluateType1}{pairp}
\calls{evaluateType1}{qcar}
\calls{evaluateType1}{qcdr}
\calls{evaluateType1}{getAndEvalConstructorArguments}
@@ -33478,7 +33427,7 @@ Evaluates the arguments passed to a constructor
(|putTarget| tree m)
(progn
(setq tmp1 (|bottomUp| tree))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil))))
(setq m1 (qcar tmp1))
(setq z1 (|getAndEvalConstructorArgument| tree))
@@ -33531,8 +33480,8 @@ Calls evaluateType on a signature
\begin{chunk}{defun evaluateSignature}
(defun |evaluateSignature| (sig)
(cond
- ((and (pairp sig) (eq (qcar sig) 'signature) (pairp (qcdr sig))
- (pairp (qcdr (qcdr sig))) (eq (qcdr (qcdr (qcdr sig))) nil))
+ ((and (consp sig) (eq (qcar sig) 'signature) (consp (qcdr sig))
+ (consp (qcdr (qcdr sig))) (eq (qcdr (qcdr (qcdr sig))) nil))
(cons 'signature (cons (qcar (qcdr sig))
(list
(loop for z in (qcar (qcdr (qcdr sig)))
@@ -33600,7 +33549,6 @@ $previousBindings := nil
\calls{undo}{pname}
\calls{undo}{read}
\calls{undo}{userError}
-\calls{undo}{pairp}
\calls{undo}{qcdr}
\calls{undo}{qcar}
\calls{undo}{spaddifference}
@@ -33615,11 +33563,11 @@ $previousBindings := nil
(declare (special |$options| |$InteractiveFrame|))
(setq undoWhen '|after|)
(when
- (and (pairp |$options|)
+ (and (consp |$options|)
(eq (qcdr |$options|) nil)
(progn
(setq tmp1 (qcar |$options|))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn (setq key (qcar tmp1)) t)))
(cond
@@ -33977,7 +33925,6 @@ Properties of r ::
\calls{undoSteps}{recordFrame}
\calls{undoSteps}{copy}
\calls{undoSteps}{undoSingleStep}
-\calls{undoSteps}{pairp}
\calls{undoSteps}{qcdr}
\calls{undoSteps}{qcar}
\usesdollar{undoSteps}{IOindex}
@@ -33993,13 +33940,13 @@ Properties of r ::
(do ((i 0 (1+ i)) (framelist |$frameRecord| (cdr framelist)))
((or (> i m) (atom framelist)) nil)
(setq env (|undoSingleStep| (CAR framelist) env))
- (if (and (pairp framelist)
+ (if (and (consp framelist)
(progn
(setq tmp1 (qcdr framelist))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq tmp2 (qcar tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcar tmp2) '|systemCommand|)
(progn
(setq systemDelta (qcdr tmp2))
@@ -34336,13 +34283,12 @@ o )show
\end{chunk}
\defun{whatSpad2Cmd,fixpat}{whatSpad2Cmd,fixpat}
-\calls{whatSpad2Cmd,fixpat}{pairp}
\calls{whatSpad2Cmd,fixpat}{qcar}
\calls{whatSpad2Cmd,fixpat}{downcase}
\begin{chunk}{defun whatSpad2Cmd,fixpat}
(defun |whatSpad2Cmd,fixpat| (x)
(let (xp)
- (if (and (pairp x) (progn (setq xp (qcar x)) t))
+ (if (and (consp x) (progn (setq xp (qcar x)) t))
(downcase xp)
(downcase x))))
@@ -34950,10 +34896,10 @@ in the addBinding function.
(cond
(|$InteractiveMode| (|addBindingInteractive| var proplist e))
(t
- (when (and (pairp curContour)
+ (when (and (consp curContour)
(progn
(setq tmp1 (qcar curContour))
- (and (pairp tmp1) (equal (qcar tmp1) var))))
+ (and (consp tmp1) (equal (qcar tmp1) var))))
(setq curContour (cdr curContour)))
(setq lx (cons var proplist))
(cons (cons (cons lx curContour) tailContour) tailEnv)))))))
@@ -36520,7 +36466,7 @@ Format of an entry in browse.daase:
*browse-stream* *defaultdomain-list* *interp-stream*
*category-stream* *hasCategory-hash* *operation-stream*))
(when (or (symbolp constructor)
- (and (eq key 'hascategory) (pairp constructor)))
+ (and (eq key 'hascategory) (consp constructor)))
(case key
; note that abbreviation, constructorkind and cosig are heavy hitters
; thus they occur first in the list of things to check
@@ -37944,7 +37890,6 @@ filetype and filemode. We also UPCASE everything.
\end{chunk}
\defun{pathname}{Axiom pathnames}
-\calls{pathname}{pairp}
\calls{pathname}{pathname}
\calls{pathname}{make-filename}
\begin{chunk}{defun pathname}
@@ -37952,7 +37897,7 @@ filetype and filemode. We also UPCASE everything.
(cond
((null p) p)
((pathnamep p) p)
- ((null (pairp p)) (pathname p))
+ ((null (consp p)) (pathname p))
(t
(when (> (|#| p) 2) (setq p (cons (elt p 0) (cons (elt p 1) nil))))
(pathname (apply #'make-filename p)))))
@@ -37981,14 +37926,13 @@ filetype and filemode. We also UPCASE everything.
\end{chunk}
\defun{wrap}{wrap}
-\calls{wrap}{pairp}
\calls{wrap}{lotsof}
\calls{wrap}{wrap}
\begin{chunk}{defun wrap}
(defun wrap (list-of-items wrapper)
(prog nil
(cond
- ((or (not (pairp list-of-items)) (not wrapper))
+ ((or (not (consp list-of-items)) (not wrapper))
(return list-of-items))
((not (consp wrapper))
(setq wrapper (lotsof wrapper))))
diff --git a/books/bookvol9.pamphlet b/books/bookvol9.pamphlet
index f878a09..449ee85 100644
--- a/books/bookvol9.pamphlet
+++ b/books/bookvol9.pamphlet
@@ -3751,7 +3751,7 @@ For instance, for the file {\tt EQ.spad}, we get:
(setq $comblocklist nil)
(setq $skipme nil)
(when $preparse-last-line
- (if (pairp $preparse-last-line)
+ (if (consp $preparse-last-line)
(setq stack $preparse-last-line)
(push $preparse-last-line stack))
(setq $index (- $index (length stack))))
@@ -4443,14 +4443,14 @@ A reduction of a rule is any S-Expression the rule chooses to stack.
(g (op)
(let (tmp1 tmp2 x)
(seq
- (if (and (pairp op) (eq (qcar op) '|elt|)
+ (if (and (consp op) (eq (qcar op) '|elt|)
(progn
(setq tmp1 (qcdr op))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq op (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn (setq x (qcar tmp2)) t))))))
(exit (g x)))
@@ -4467,7 +4467,7 @@ A reduction of a rule is any S-Expression the rule chooses to stack.
(cond
((eq u '|construct|)
(setq r (|parseConstruct| argl))
- (if (and (pairp |$op|) (eq (qcar |$op|) '|elt|))
+ (if (and (consp |$op|) (eq (qcar |$op|) '|elt|))
(cons (|parseTran| |$op|) (cdr r))
r))
((and (atom u) (setq fn (getl u '|parseTran|)))
@@ -4625,8 +4625,8 @@ of the symbol being parsed. The original list read:
(defun |parseType| (x)
(declare (special |$EmptyMode| |$quadSymbol|))
(setq x (msubst |$EmptyMode| |$quadSymbol| x))
- (if (and (pairp x) (eq (qcar x) '|typeOf|)
- (pairp (qcdr x)) (eq (qcdr (qcdr x)) nil))
+ (if (and (consp x) (eq (qcar x) '|typeOf|)
+ (consp (qcdr x)) (eq (qcdr (qcdr x)) nil))
(list '|typeOf| (|parseTran| (qcar (qcdr x))))
x))
@@ -4657,9 +4657,9 @@ of the symbol being parsed. The original list read:
\begin{chunk}{defun parseDropAssertions}
(defun |parseDropAssertions| (x)
(cond
- ((not (pairp x)) x)
- ((and (pairp (qcar x)) (eq (qcar (qcar x)) 'if)
- (pairp (qcdr (qcar x)))
+ ((not (consp x)) x)
+ ((and (consp (qcar x)) (eq (qcar (qcar x)) 'if)
+ (consp (qcdr (qcar x)))
(eq (qcar (qcdr (qcar x))) '|asserted|))
(|parseDropAssertions| (qcdr x)))
(t (cons (qcar x) (|parseDropAssertions| (qcdr x))))))
@@ -4702,9 +4702,9 @@ of the symbol being parsed. The original list read:
(defun |parseColon| (arg)
(declare (special |$insideConstructIfTrue|))
(cond
- ((and (pairp arg) (eq (qcdr arg) nil))
+ ((and (consp arg) (eq (qcdr arg) nil))
(list '|:| (|parseTran| (first arg))))
- ((and (pairp arg) (pairp (qcdr arg)) (eq (qcdr (qcdr arg)) nil))
+ ((and (consp arg) (consp (qcdr arg)) (eq (qcdr (qcdr arg)) nil))
(if |$InteractiveMode|
(if |$insideConstructIfTrue|
(list 'tag (|parseTran| (first arg))
@@ -4776,7 +4776,6 @@ of the symbol being parsed. The original list read:
\defun{transIs1}{transIs1}
\calls{transIs1}{qcar}
\calls{transIs1}{qcdr}
-\calls{transIs1}{pairp}
\calls{transIs1}{nreverse0}
\calls{transIs1}{transIs}
\calls{transIs1}{transIs1}
@@ -4784,27 +4783,27 @@ of the symbol being parsed. The original list read:
(defun |transIs1| (u)
(let (x h v tmp3)
(cond
- ((and (pairp u) (eq (qcar u) '|construct|))
+ ((and (consp u) (eq (qcar u) '|construct|))
(dolist (x (qcdr u) (nreverse0 tmp3))
(push (|transIs| x) tmp3)))
- ((and (pairp u) (eq (qcar u) '|append|) (pairp (qcdr u))
- (pairp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
+ ((and (consp u) (eq (qcar u) '|append|) (consp (qcdr u))
+ (consp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
(setq x (qcar (qcdr u)))
(setq h (list '|:| (|transIs| x)))
(setq v (|transIs1| (qcar (qcdr (qcdr u)))))
(cond
- ((and (pairp v) (eq (qcar v) '|:|)
- (pairp (qcdr v)) (eq (qcdr (qcdr v)) nil))
+ ((and (consp v) (eq (qcar v) '|:|)
+ (consp (qcdr v)) (eq (qcdr (qcdr v)) nil))
(list h (qcar (qcdr v))))
((eq v '|nil|) (car (cdr h)))
((atom v) (list h (list '|:| v)))
(t (cons h v))))
- ((and (pairp u) (eq (qcar u) '|cons|) (pairp (qcdr u))
- (pairp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
+ ((and (consp u) (eq (qcar u) '|cons|) (consp (qcdr u))
+ (consp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
(setq h (|transIs| (qcar (qcdr u))))
(setq v (|transIs1| (qcar (qcdr (qcdr u)))))
(cond
- ((and (pairp v) (eq (qcar v) '|:|) (pairp (qcdr v))
+ ((and (consp v) (eq (qcar v) '|:|) (consp (qcdr v))
(eq (qcdr (qcdr v)) nil))
(cons h (list (qcar (qcdr v)))))
((eq v '|nil|) (cons h nil))
@@ -4818,7 +4817,7 @@ of the symbol being parsed. The original list read:
\calls{isListConstructor}{member}
\begin{chunk}{defun isListConstructor}
(defun |isListConstructor| (u)
- (and (pairp u) (|member| (qcar u) '(|construct| |append| |cons|))))
+ (and (consp u) (|member| (qcar u) '(|construct| |append| |cons|))))
\end{chunk}
@@ -5003,18 +5002,18 @@ of the symbol being parsed. The original list read:
(declare (special |$InteractiveMode|))
(when |$InteractiveMode| (setq arg (|unabbrevAndLoad| arg)))
(cond
- ((and (pairp arg) (eq (qcar arg) '|:|) (pairp (qcdr arg))
- (pairp (qcdr (qcdr arg))) (eq (qcdr (qcdr (qcdr arg))) nil)
- (pairp (qcar (qcdr (qcdr arg))))
+ ((and (consp arg) (eq (qcar arg) '|:|) (consp (qcdr arg))
+ (consp (qcdr (qcdr arg))) (eq (qcdr (qcdr (qcdr arg))) nil)
+ (consp (qcar (qcdr (qcdr arg))))
(eq (qcar (qcar (qcdr (qcdr arg)))) '|Mapping|))
(setq map (rest (third arg)))
(setq op (second arg))
(setq op (if (stringp op) (intern op) op))
(list (list 'signature op map)))
- ((and (pairp arg) (eq (qcar arg) '|Join|))
+ ((and (consp arg) (eq (qcar arg) '|Join|))
(dolist (z (rest arg) tmp4)
(setq tmp4 (append tmp4 (fn z)))))
- ((and (pairp arg) (eq (qcar arg) 'category))
+ ((and (consp arg) (eq (qcar arg) 'category))
(dolist (z (rest arg) tmp6)
(setq tmp6 (append tmp6 (fn z)))))
(t
@@ -5022,9 +5021,9 @@ of the symbol being parsed. The original list read:
(cond
((or (eq kk '|domain|) (eq kk '|category|))
(list (|makeNonAtomic| arg)))
- ((and (pairp arg) (eq (qcar arg) 'attribute))
+ ((and (consp arg) (eq (qcar arg) 'attribute))
(list arg))
- ((and (pairp arg) (eq (qcar arg) 'signature))
+ ((and (consp arg) (eq (qcar arg) 'signature))
(list arg))
(|$InteractiveMode|
(|parseHasRhs| arg))
@@ -5036,7 +5035,7 @@ of the symbol being parsed. The original list read:
(setq tmp1 (|get| x '|value| |$CategoryFrame|))
(when |$InteractiveMode|
(setq x
- (if (and (pairp tmp1) (pairp (qcdr tmp1)) (pairp (qcdr (qcdr tmp1)))
+ (if (and (consp tmp1) (consp (qcdr tmp1)) (consp (qcdr (qcdr tmp1)))
(eq (qcdr (qcdr (qcdr tmp1))) nil)
(|member| (second tmp1)
'((|Mode|) (|Domain|) (|SubDomain| (|Domain|)))))
@@ -5045,7 +5044,7 @@ of the symbol being parsed. The original list read:
(setq tmp2
(dolist (u (fn (second arg)) (nreverse0 tmp3))
(push (list '|has| x u ) tmp3)))
- (if (and (pairp tmp2) (eq (qcdr tmp2) nil))
+ (if (and (consp tmp2) (eq (qcdr tmp2) nil))
(qcar tmp2)
(cons '|and| tmp2)))))
@@ -5066,8 +5065,8 @@ of the symbol being parsed. The original list read:
(declare (special |$CategoryFrame|))
(setq tmp1 (|get| u '|value| |$CategoryFrame|))
(cond
- ((and (pairp tmp1) (pairp (qcdr tmp1))
- (pairp (qcdr (qcdr tmp1))) (eq (qcdr (qcdr (qcdr tmp1))) nil)
+ ((and (consp tmp1) (consp (qcdr tmp1))
+ (consp (qcdr (qcdr tmp1))) (eq (qcdr (qcdr (qcdr tmp1))) nil)
(|member| (second tmp1)
'((|Mode|) (|Domain|) (|SubDomain| (|Domain|)))))
(second tmp1))
@@ -5209,8 +5208,8 @@ of the symbol being parsed. The original list read:
\calls{parseIf}{parseTran}
\begin{chunk}{defun parseIf}
(defun |parseIf| (arg)
- (if (null (and (pairp arg) (pairp (qcdr arg))
- (pairp (qcdr (qcdr arg))) (eq (qcdr (qcdr (qcdr arg))) nil)))
+ (if (null (and (consp arg) (consp (qcdr arg))
+ (consp (qcdr (qcdr arg))) (eq (qcdr (qcdr (qcdr arg))) nil)))
arg
(|parseIf,ifTran|
(|parseTran| (first arg))
@@ -5235,38 +5234,38 @@ of the symbol being parsed. The original list read:
a)
((and (null |$InteractiveMode|) (eq pred '|false|))
b)
- ((and (pairp pred) (eq (qcar pred) '|not|)
- (pairp (qcdr pred)) (eq (qcdr (qcdr pred)) nil))
+ ((and (consp pred) (eq (qcar pred) '|not|)
+ (consp (qcdr pred)) (eq (qcdr (qcdr pred)) nil))
(|parseIf,ifTran| (second pred) b a))
- ((and (pairp pred) (eq (qcar pred) 'if)
+ ((and (consp pred) (eq (qcar pred) 'if)
(progn
(setq tmp1 (qcdr pred))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq pp (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(progn
(setq ap (qcar tmp2))
(setq tmp3 (qcdr tmp2))
- (and (pairp tmp3)
+ (and (consp tmp3)
(eq (qcdr tmp3) nil)
(progn (setq bp (qcar tmp3)) t))))))))
(|parseIf,ifTran| pp
(|parseIf,ifTran| ap (copy a) (copy b))
(|parseIf,ifTran| bp a b)))
- ((and (pairp pred) (eq (qcar pred) 'seq)
- (pairp (qcdr pred)) (progn (setq tmp2 (reverse (qcdr pred))) t)
- (and (pairp tmp2)
- (pairp (qcar tmp2))
+ ((and (consp pred) (eq (qcar pred) 'seq)
+ (consp (qcdr pred)) (progn (setq tmp2 (reverse (qcdr pred))) t)
+ (and (consp tmp2)
+ (consp (qcar tmp2))
(eq (qcar (qcar tmp2)) '|exit|)
(progn
(setq tmp4 (qcdr (qcar tmp2)))
- (and (pairp tmp4)
+ (and (consp tmp4)
(equal (qcar tmp4) 1)
(progn
(setq tmp5 (qcdr tmp4))
- (and (pairp tmp5)
+ (and (consp tmp5)
(eq (qcdr tmp5) nil)
(progn (setq pp (qcar tmp5)) t)))))
(progn (setq z (qcdr tmp2)) t))
@@ -5277,34 +5276,34 @@ of the symbol being parsed. The original list read:
(list '|exit| 1 (|parseIf,ifTran| pp
(|incExitLevel| a)
(|incExitLevel| b)))))))
- ((and (pairp a) (eq (qcar a) 'if) (pairp (qcdr a))
- (equal (qcar (qcdr a)) pred) (pairp (qcdr (qcdr a)))
- (pairp (qcdr (qcdr (qcdr a))))
+ ((and (consp a) (eq (qcar a) 'if) (consp (qcdr a))
+ (equal (qcar (qcdr a)) pred) (consp (qcdr (qcdr a)))
+ (consp (qcdr (qcdr (qcdr a))))
(eq (qcdr (qcdr (qcdr (qcdr a)))) nil))
(list 'if pred (third a) b))
- ((and (pairp b) (eq (qcar b) 'if)
- (pairp (qcdr b)) (equal (qcar (qcdr b)) pred)
- (pairp (qcdr (qcdr b)))
- (pairp (qcdr (qcdr (qcdr b))))
+ ((and (consp b) (eq (qcar b) 'if)
+ (consp (qcdr b)) (equal (qcar (qcdr b)) pred)
+ (consp (qcdr (qcdr b)))
+ (consp (qcdr (qcdr (qcdr b))))
(eq (qcdr (qcdr (qcdr (qcdr b)))) nil))
(list 'if pred a (fourth b)))
((progn
(setq tmp1 (|makeSimplePredicateOrNil| pred))
- (and (pairp tmp1) (eq (qcar tmp1) 'seq)
+ (and (consp tmp1) (eq (qcar tmp1) 'seq)
(progn
(setq tmp2 (qcdr tmp1))
- (and (and (pairp tmp2)
+ (and (and (consp tmp2)
(progn (setq tmp3 (reverse tmp2)) t))
- (and (pairp tmp3)
+ (and (consp tmp3)
(progn
(setq tmp4 (qcar tmp3))
- (and (pairp tmp4) (eq (qcar tmp4) '|exit|)
+ (and (consp tmp4) (eq (qcar tmp4) '|exit|)
(progn
(setq tmp5 (qcdr tmp4))
- (and (pairp tmp5) (equal (qcar tmp5) 1)
+ (and (consp tmp5) (equal (qcar tmp5) 1)
(progn
(setq tmp6 (qcdr tmp5))
- (and (pairp tmp6) (eq (qcdr tmp6) nil)
+ (and (consp tmp6) (eq (qcdr tmp6) nil)
(progn (setq val (qcar tmp6)) t)))))))
(progn (setq s (qcdr tmp3)) t))))))
(setq s (nreverse s))
@@ -5348,32 +5347,32 @@ of the symbol being parsed. The original list read:
(setq i (|parseTran| (first arg)))
(setq n (|parseTran| (second arg)))
(cond
- ((and (pairp n) (eq (qcar n) 'segment)
- (pairp (qcdr n)) (eq (qcdr (qcdr n)) nil))
+ ((and (consp n) (eq (qcar n) 'segment)
+ (consp (qcdr n)) (eq (qcdr (qcdr n)) nil))
(list 'step i (second n) 1))
- ((and (pairp n) (eq (qcar n) '|reverse|)
- (pairp (qcdr n)) (eq (qcdr (qcdr n)) nil)
- (pairp (qcar (qcdr n))) (eq (qcar (qcar (qcdr n))) 'segment)
- (pairp (qcdr (qcar (qcdr n))))
+ ((and (consp n) (eq (qcar n) '|reverse|)
+ (consp (qcdr n)) (eq (qcdr (qcdr n)) nil)
+ (consp (qcar (qcdr n))) (eq (qcar (qcar (qcdr n))) 'segment)
+ (consp (qcdr (qcar (qcdr n))))
(eq (qcdr (qcdr (qcar (qcdr n)))) nil))
(|postError| (list " You cannot reverse an infinite sequence." )))
- ((and (pairp n) (eq (qcar n) 'segment)
- (pairp (qcdr n)) (pairp (qcdr (qcdr n)))
+ ((and (consp n) (eq (qcar n) 'segment)
+ (consp (qcdr n)) (consp (qcdr (qcdr n)))
(eq (qcdr (qcdr (qcdr n))) nil))
(if (third n)
(list 'step i (second n) 1 (third n))
(list 'step i (second n) 1)))
- ((and (pairp n) (eq (qcar n) '|reverse|)
- (pairp (qcdr n)) (eq (qcdr (qcdr n)) nil)
- (pairp (qcar (qcdr n))) (eq (qcar (qcar (qcdr n))) 'segment)
- (pairp (qcdr (qcar (qcdr n))))
- (pairp (qcdr (qcdr (qcar (qcdr n)))))
+ ((and (consp n) (eq (qcar n) '|reverse|)
+ (consp (qcdr n)) (eq (qcdr (qcdr n)) nil)
+ (consp (qcar (qcdr n))) (eq (qcar (qcar (qcdr n))) 'segment)
+ (consp (qcdr (qcar (qcdr n))))
+ (consp (qcdr (qcdr (qcar (qcdr n)))))
(eq (qcdr (qcdr (qcdr (qcar (qcdr n))))) nil))
(if (third (second n))
(list 'step i (third (second n)) -1 (second (second n)))
(|postError| (list " You cannot reverse an infinite sequence."))))
- ((and (pairp n) (eq (qcar n) '|tails|)
- (pairp (qcdr n)) (eq (qcdr (qcdr n)) nil))
+ ((and (consp n) (eq (qcar n) '|tails|)
+ (consp (qcdr n)) (eq (qcdr (qcdr n)) nil))
(list 'on i (second n)))
(t
(list 'in i n)))))
@@ -5400,10 +5399,10 @@ of the symbol being parsed. The original list read:
(setq inc (third arg))
(setq u (|parseIn| (list i n)))
(cond
- ((null (and (pairp u) (eq (qcar u) 'step)
- (pairp (qcdr u))
- (pairp (qcdr (qcdr u)))
- (pairp (qcdr (qcdr (qcdr u))))))
+ ((null (and (consp u) (eq (qcar u) 'step)
+ (consp (qcdr u))
+ (consp (qcdr (qcdr u)))
+ (consp (qcdr (qcdr (qcdr u))))))
(|postError|
(cons '| You cannot use|
(append (|bright| "by")
@@ -5467,7 +5466,7 @@ of the symbol being parsed. The original list read:
(cond
((null arg)
nil)
- ((and (pairp arg) (pairp (qcar arg)) (eq (qcar (qcar arg)) '|Join|))
+ ((and (consp arg) (consp (qcar arg)) (eq (qcar (qcar arg)) '|Join|))
(append (cdar arg) (fn (rest arg))))
(t
(cons (first arg) (fn (rest arg))))))
@@ -5650,8 +5649,8 @@ of the symbol being parsed. The original list read:
(|$InteractiveMode| (cons '|or| (|parseTranList| arg)))
((null arg) '|false|)
((null (cdr arg)) (car arg))
- ((and (pairp x) (eq (qcar x) '|not|)
- (pairp (qcdr x)) (eq (qcdr (qcdr x)) nil))
+ ((and (consp x) (eq (qcar x) '|not|)
+ (consp (qcdr x)) (eq (qcdr (qcdr x)) nil))
(|parseIf| (list (second x) (|parseOr| (cdr arg)) '|true|)))
(t
(|parseIf| (list x '|true| (|parseOr| (cdr arg))))))))
@@ -5714,7 +5713,7 @@ of the symbol being parsed. The original list read:
\calls{parseSegment}{parseTran}
\begin{chunk}{defun parseSegment}
(defun |parseSegment| (arg)
- (if (and (pairp arg) (pairp (qcdr arg)) (eq (qcdr (qcdr arg)) nil))
+ (if (and (consp arg) (consp (qcdr arg)) (eq (qcdr (qcdr arg)) nil))
(if (second arg)
(list 'segment (|parseTran| (first arg)) (|parseTran| (second arg)))
(list 'segment (|parseTran| (first arg))))
@@ -5737,9 +5736,9 @@ of the symbol being parsed. The original list read:
\begin{chunk}{defun parseSeq}
(defun |parseSeq| (arg)
(let (tmp1)
- (when (pairp arg) (setq tmp1 (reverse arg)))
- (if (null (and (pairp arg) (pairp tmp1)
- (pairp (qcar tmp1)) (eq (qcar (qcar tmp1)) '|exit|)))
+ (when (consp arg) (setq tmp1 (reverse arg)))
+ (if (null (and (consp arg) (consp tmp1)
+ (consp (qcar tmp1)) (eq (qcar (qcar tmp1)) '|exit|)))
(|postError| (list " Invalid ending to block: " (|last| arg)))
(|transSeq| (|mapInto| arg '|parseTran|)))))
@@ -5915,26 +5914,26 @@ $\rightarrow$
(defun |getTargetFromRhs| (lhs rhs env)
(declare (special |$EmptyMode|))
(cond
- ((and (pairp rhs) (eq (qcar rhs) 'capsule))
+ ((and (consp rhs) (eq (qcar rhs) 'capsule))
(|stackSemanticError|
(list "target category of " lhs
" cannot be determined from definition")
nil))
- ((and (pairp rhs) (eq (qcar rhs) '|SubDomain|) (pairp (qcdr rhs)))
+ ((and (consp rhs) (eq (qcar rhs) '|SubDomain|) (consp (qcdr rhs)))
(|getTargetFromRhs| lhs (second rhs) env))
- ((and (pairp rhs) (eq (qcar rhs) '|add|)
- (pairp (qcdr rhs)) (pairp (qcdr (qcdr rhs)))
+ ((and (consp rhs) (eq (qcar rhs) '|add|)
+ (consp (qcdr rhs)) (consp (qcdr (qcdr rhs)))
(eq (qcdr (qcdr (qcdr rhs))) nil)
- (pairp (qcar (qcdr (qcdr rhs))))
+ (consp (qcar (qcdr (qcdr rhs))))
(eq (qcar (qcar (qcdr (qcdr rhs)))) 'capsule))
(|getTargetFromRhs| lhs (second rhs) env))
- ((and (pairp rhs) (eq (qcar rhs) '|Record|))
+ ((and (consp rhs) (eq (qcar rhs) '|Record|))
(cons '|RecordCategory| (rest rhs)))
- ((and (pairp rhs) (eq (qcar rhs) '|Union|))
+ ((and (consp rhs) (eq (qcar rhs) '|Union|))
(cons '|UnionCategory| (rest rhs)))
- ((and (pairp rhs) (eq (qcar rhs) '|List|))
+ ((and (consp rhs) (eq (qcar rhs) '|List|))
(cons '|ListCategory| (rest rhs)))
- ((and (pairp rhs) (eq (qcar rhs) '|Vector|))
+ ((and (consp rhs) (eq (qcar rhs) '|Vector|))
(cons '|VectorCategory| (rest rhs)))
(t
(second (|compOrCroak| rhs |$EmptyMode| env)))))
@@ -5981,11 +5980,11 @@ $\rightarrow$
(if (setq u (|get| form '|macro| env))
(|macroExpand| u env)
form))
- ((and (pairp form) (eq (qcar form) 'def)
- (pairp (qcdr form))
- (pairp (qcdr (qcdr form)))
- (pairp (qcdr (qcdr (qcdr form))))
- (pairp (qcdr (qcdr (qcdr (qcdr form)))))
+ ((and (consp form) (eq (qcar form) 'def)
+ (consp (qcdr form))
+ (consp (qcdr (qcdr form)))
+ (consp (qcdr (qcdr (qcdr form))))
+ (consp (qcdr (qcdr (qcdr (qcdr form)))))
(eq (qcdr (qcdr (qcdr (qcdr (qcdr form))))) nil))
(list 'def (|macroExpand| (second form) env)
(|macroExpandList| (third form) env)
@@ -6001,7 +6000,7 @@ $\rightarrow$
\begin{chunk}{defun macroExpandList}
(defun |macroExpandList| (lst env)
(let (tmp)
- (if (and (pairp lst) (eq (qcdr lst) nil)
+ (if (and (consp lst) (eq (qcdr lst) nil)
(identp (qcar lst)) (getdatabase (qcar lst) 'niladic)
(setq tmp (|get| (qcar lst) '|macro| env)))
(|macroExpand| tmp env)
@@ -6037,8 +6036,8 @@ $\rightarrow$
(setq sc (fourth df))
(setq body (fifth df))
(setq categoryCapsule
- (when (and (pairp body) (eq (qcar body) '|add|)
- (pairp (qcdr body)) (pairp (qcdr (qcdr body)))
+ (when (and (consp body) (eq (qcar body) '|add|)
+ (consp (qcdr body)) (consp (qcdr (qcdr body)))
(eq (qcdr (qcdr (qcdr body))) nil))
(setq tmp1 (third body))
(setq body (second body))
@@ -6069,11 +6068,11 @@ $\rightarrow$
(fn (u pl)
(declare (special |$tvl| |$mvl|))
(cond
- ((and (pairp u) (eq (qcar u) '|Join|) (pairp (qcdr u)))
+ ((and (consp u) (eq (qcar u) '|Join|) (consp (qcdr u)))
(fn (car (reverse (qcdr u))) pl))
- ((and (pairp u) (eq (qcar u) '|has|))
+ ((and (consp u) (eq (qcar u) '|has|))
(|insert| (eqsubstlist |$mvl| |$tvl| u) pl))
- ((and (pairp u) (member (qcar u) '(signature attribute))) pl)
+ ((and (consp u) (member (qcar u) '(signature attribute))) pl)
((atom u) pl)
(t (fnl u pl))))
(fnl (u pl)
@@ -6106,14 +6105,14 @@ $\rightarrow$
(fn (x oplist)
(cond
((atom x) oplist)
- ((and (pairp x) (eq (qcar x) 'def) (pairp (qcdr x)))
+ ((and (consp x) (eq (qcar x) 'def) (consp (qcdr x)))
(cons (second x) oplist))
(t
(fn (cdr x) (fn (car x) oplist)))))
(gn (cat)
(cond
- ((and (pairp cat) (eq (qcar cat) 'category)) (cddr cat))
- ((and (pairp cat) (eq (qcar cat) '|Join|)) (gn (|last| (qcdr cat))))
+ ((and (consp cat) (eq (qcar cat) 'category)) (cddr cat))
+ ((and (consp cat) (eq (qcar cat) '|Join|)) (gn (|last| (qcdr cat))))
(t nil))))
(let (|$options| op argl packageName packageAbb nameForDollar packageArgl
capsuleDefAlist explicitCatPart catvec fullCatOpList op1 sig
@@ -6153,7 +6152,6 @@ $\rightarrow$
\end{chunk}
\defun{mkEvalableCategoryForm}{mkEvalableCategoryForm}
-\calls{mkEvalableCategoryForm}{pairp}
\calls{mkEvalableCategoryForm}{qcar}
\calls{mkEvalableCategoryForm}{qcdr}
\calls{mkEvalableCategoryForm}{mkEvalableCategoryForm}
@@ -6173,7 +6171,7 @@ $\rightarrow$
(let (op argl tmp1 x m)
(declare (special |$Category| |$e| |$EmptyMode| |$CategoryFrame|
|$CategoryNames|))
- (if (pairp c)
+ (if (consp c)
(progn
(setq op (qcar c))
(setq argl (qcdr c))
@@ -6377,7 +6375,6 @@ $\rightarrow$
\defun{compile}{compile}
\calls{compile}{member}
\calls{compile}{getmode}
-\calls{compile}{pairp}
\calls{compile}{qcar}
\calls{compile}{qcdr}
\calls{compile}{get}
@@ -6424,7 +6421,7 @@ $\rightarrow$
(and (null (|member| op |$formalArgList|))
(progn
(setq tmp1 (|getmode| op |$e|))
- (and (pairp tmp1) (eq (qcar tmp1) '|Mapping|)))))))
+ (and (consp tmp1) (eq (qcar tmp1) '|Mapping|)))))))
(let (op lamExpr DC sig sel opexport opmodes opp parts s tt unew
optimizedBody stuffToCompile result functionStats)
(declare (special |$functionStats| |$macroIfTrue| |$doNotCompileJustPrint|
@@ -6552,7 +6549,6 @@ Code for encoding function names inside package or domain
\end{chunk}
\defun{mkRepititionAssoc}{mkRepititionAssoc}
-\calls{mkRepititionAssoc}{pairp}
\calls{mkRepititionAssoc}{qcar}
\calls{mkRepititionAssoc}{qcdr}
\begin{chunk}{defun mkRepititionAssoc}
@@ -6561,8 +6557,8 @@ Code for encoding function names inside package or domain
(mkRepfun (z n)
(cond
((null z) nil)
- ((and (pairp z) (eq (qcdr z) nil) (list (cons n (qcar z)))))
- ((and (pairp z) (pairp (qcdr z)) (equal (qcar (qcdr z)) (qcar z)))
+ ((and (consp z) (eq (qcdr z) nil) (list (cons n (qcar z)))))
+ ((and (consp z) (consp (qcdr z)) (equal (qcar (qcdr z)) (qcar z)))
(mkRepfun (cdr z) (1+ n)))
(t (cons (cons n (car z)) (mkRepfun (cdr z) 1))))))
(mkRepfun z 1)))
@@ -6595,14 +6591,13 @@ Code for encoding function names inside package or domain
\defun{encodeItem}{encodeItem}
\calls{encodeItem}{getCaps}
\calls{encodeItem}{identp}
-\calls{encodeItem}{pairp}
\calls{encodeItem}{qcar}
\calls{encodeItem}{pname}
\calls{encodeItem}{stringimage}
\begin{chunk}{defun encodeItem}
(defun |encodeItem| (x)
(cond
- ((pairp x) (|getCaps| (qcar x)))
+ ((consp x) (|getCaps| (qcar x)))
((identp x) (pname x))
(t (stringimage x))))
@@ -6654,7 +6649,6 @@ constructMacro (form is [nam,[lam,vl,body]])
\end{chunk}
\defun{spadCompileOrSetq}{spadCompileOrSetq}
-\calls{spadCompileOrSetq}{pairp}
\calls{spadCompileOrSetq}{qcar}
\calls{spadCompileOrSetq}{qcdr}
\calls{spadCompileOrSetq}{contained}
@@ -6674,14 +6668,14 @@ constructMacro (form is [nam,[lam,vl,body]])
(setq vl (cadadr form))
(setq body (car (cddadr form)))
(cond
- ((and (pairp vl) (progn (setq tmp1 (reverse vl)) t)
- (pairp tmp1)
+ ((and (consp vl) (progn (setq tmp1 (reverse vl)) t)
+ (consp tmp1)
(progn
(setq e (qcar tmp1))
(setq vlp (qcdr tmp1))
t)
(progn (setq vlp (nreverse vlp)) t)
- (pairp body)
+ (consp body)
(progn (setq namp (qcar body)) t)
(equal (qcdr body) vlp))
(|LAM,EVALANDFILEACTQ|
@@ -6694,9 +6688,9 @@ constructMacro (form is [nam,[lam,vl,body]])
(loop for x in body
do (setq result (and result (atom x))))
result))
- (pairp vl)
+ (consp vl)
(progn (setq tmp1 (reverse vl)) t)
- (pairp tmp1)
+ (consp tmp1)
(progn
(setq e (qcar tmp1))
(setq vlp (qcdr tmp1))
@@ -6846,7 +6840,6 @@ constructMacro (form is [nam,[lam,vl,body]])
\end{chunk}
\defun{mkAlistOfExplicitCategoryOps}{mkAlistOfExplicitCategoryOps}
-\calls{mkAlistOfExplicitCategoryOps}{pairp}
\calls{mkAlistOfExplicitCategoryOps}{qcar}
\calls{mkAlistOfExplicitCategoryOps}{qcdr}
\calls{mkAlistOfExplicitCategoryOps}{keyedSystemError}
@@ -6864,20 +6857,20 @@ constructMacro (form is [nam,[lam,vl,body]])
(atomizeOp (op)
(cond
((atom op) op)
- ((and (pairp op) (eq (qcdr op) nil)) (qcar op))
+ ((and (consp op) (eq (qcdr op) nil)) (qcar op))
(t (|keyedSystemError| 'S2GE0016
(list "mkAlistOfExplicitCategoryOps" "bad signature")))))
(fn (op u)
- (if (and (pairp u) (pairp (qcar u)))
+ (if (and (consp u) (consp (qcar u)))
(if (equal (qcar (qcar u)) op)
(cons (qcdr (qcar u)) (fn op (qcdr u)))
(fn op (qcdr u))))))
(let (z tmp1 op sig u opList)
(declare (special |$e|))
- (when (and (pairp target) (eq (qcar target) '|add|) (pairp (qcdr target)))
+ (when (and (consp target) (eq (qcar target) '|add|) (consp (qcdr target)))
(setq target (second target)))
(cond
- ((and (pairp target) (eq (qcar target) '|Join|))
+ ((and (consp target) (eq (qcar target) '|Join|))
(setq z (qcdr target))
(PROG (tmp1)
(RETURN
@@ -6885,10 +6878,10 @@ constructMacro (form is [nam,[lam,vl,body]])
((OR (ATOM G167566) (PROGN (setq cat (CAR G167566)) nil))
tmp1)
(setq tmp1 (|union| tmp1 (|mkAlistOfExplicitCategoryOps| cat)))))))
- ((and (pairp target) (eq (qcar target) 'category)
+ ((and (consp target) (eq (qcar target) 'category)
(progn
(setq tmp1 (qcdr target))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn (setq z (qcdr tmp1)) t))))
(setq z (|flattenSignatureList| (cons 'progn z)))
(setq u
@@ -6898,8 +6891,8 @@ constructMacro (form is [nam,[lam,vl,body]])
((or (atom G167583)) (nreverse0 G167577))
(setq x (car G167583))
(cond
- ((and (pairp x) (eq (qcar x) 'signature) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))))
+ ((and (consp x) (eq (qcar x) 'signature) (consp (qcdr x))
+ (consp (qcdr (qcdr x))))
(setq op (qcar (qcdr x)))
(setq sig (qcar (qcdr (qcdr x))))
(setq G167577 (cons (cons (atomizeOp op) sig) G167577))))))))
@@ -6918,7 +6911,6 @@ constructMacro (form is [nam,[lam,vl,body]])
\end{chunk}
\defun{flattenSignatureList}{flattenSignatureList}
-\calls{flattenSignatureList}{pairp}
\calls{flattenSignatureList}{qcar}
\calls{flattenSignatureList}{qcdr}
\calls{flattenSignatureList}{flattenSignatureList}
@@ -6927,16 +6919,16 @@ constructMacro (form is [nam,[lam,vl,body]])
(let (zz)
(cond
((atom x) nil)
- ((and (pairp x) (eq (qcar x) 'signature)) (list x))
- ((and (pairp x) (eq (qcar x) 'if) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (pairp (qcdr (qcdr (qcdr x))))
+ ((and (consp x) (eq (qcar x) 'signature)) (list x))
+ ((and (consp x) (eq (qcar x) 'if) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (consp (qcdr (qcdr (qcdr x))))
(eq (qcdr (qcdr (qcdr (qcdr x)))) nil))
(append (|flattenSignatureList| (third x))
(|flattenSignatureList| (fourth x))))
- ((and (pairp x) (eq (qcar x) 'progn))
+ ((and (consp x) (eq (qcar x) 'progn))
(loop for x in (qcdr x)
do
- (if (and (pairp x) (eq (qcar x) 'signature))
+ (if (and (consp x) (eq (qcar x) 'signature))
(setq zz (cons x zz))
(setq zz (append (|flattenSignatureList| x) zz))))
zz)
@@ -6948,7 +6940,6 @@ constructMacro (form is [nam,[lam,vl,body]])
Create modemap form for use by the interpreter. This function
replaces all specific domains mentioned in the modemap with pattern
variables, and predicates
-\calls{interactiveModemapForm}{pairp}
\calls{interactiveModemapForm}{qcar}
\calls{interactiveModemapForm}{qcdr}
\calls{interactiveModemapForm}{nequal}
@@ -6962,8 +6953,8 @@ variables, and predicates
(defun |interactiveModemapForm| (mm)
(labels (
(fn (x)
- (if (and (pairp x) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil)
+ (if (and (consp x) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil)
(nequal (qcar x) '|isFreeFunction|)
(atom (qcar (qcdr (qcdr x)))))
(list (first x) (second x) (list (third x)))
@@ -7012,7 +7003,6 @@ identifier in newvars in the expression x
\end{chunk}
\defun{fixUpPredicate}{fixUpPredicate}
-\calls{fixUpPredicate}{pairp}
\calls{fixUpPredicate}{qcar}
\calls{fixUpPredicate}{qcdr}
\calls{fixUpPredicate}{length}
@@ -7041,10 +7031,10 @@ identifier in newvars in the expression x
(t
(setq pred (|orderPredicateItems| (car predicates) sig skip))
(setq dependList
- (when (and (pairp pred) (eq (qcar pred) '|isDomain|)
- (pairp (qcdr pred)) (pairp (qcdr (qcdr pred)))
+ (when (and (consp pred) (eq (qcar pred) '|isDomain|)
+ (consp (qcdr pred)) (consp (qcdr (qcdr pred)))
(eq (qcdr (qcdr (qcdr pred))) nil)
- (pairp (qcar (qcdr (qcdr pred))))
+ (consp (qcar (qcdr (qcdr pred))))
(eq (qcdr (qcar (qcdr (qcdr pred)))) nil))
(list (second pred))))))
(setq pred (|moveORsOutside| pred))
@@ -7054,7 +7044,6 @@ identifier in newvars in the expression x
\end{chunk}
\defun{orderPredicateItems}{orderPredicateItems}
-\calls{orderPredicateItems}{pairp}
\calls{orderPredicateItems}{qcar}
\calls{orderPredicateItems}{qcdr}
\calls{orderPredicateItems}{signatureTran}
@@ -7063,7 +7052,7 @@ identifier in newvars in the expression x
(defun |orderPredicateItems| (pred1 sig skip)
(let (pred)
(setq pred (|signatureTran| pred1))
- (if (and (pairp pred) (eq (qcar pred) 'and))
+ (if (and (consp pred) (eq (qcar pred) 'and))
(|orderPredTran| (qcdr pred) sig skip)
pred)))
@@ -7078,8 +7067,8 @@ identifier in newvars in the expression x
(declare (special |$e|))
(cond
((atom pred) pred)
- ((and (pairp pred) (eq (qcar pred) '|has|) (PAIRP (qcdr pred))
- (pairp (qcdr (qcdr pred)))
+ ((and (consp pred) (eq (qcar pred) '|has|) (CONSP (qcdr pred))
+ (consp (qcdr (qcdr pred)))
(eq (qcdr (qcdr (qcdr pred))) nil)
(|isCategoryForm| (third pred) |$e|))
(list '|ofCategory| (second pred) (third pred)))
@@ -7090,7 +7079,6 @@ identifier in newvars in the expression x
\end{chunk}
\defun{orderPredTran}{orderPredTran}
-\calls{orderPredTran}{pairp}
\calls{orderPredTran}{qcar}
\calls{orderPredTran}{qcdr}
\calls{orderPredTran}{member}
@@ -7111,14 +7099,14 @@ identifier in newvars in the expression x
(SEQ
(loop for pred in oldList
do (cond
- ((or (and (pairp pred) (pairp (qcdr pred))
- (pairp (qcdr (qcdr pred)))
+ ((or (and (consp pred) (consp (qcdr pred))
+ (consp (qcdr (qcdr pred)))
(eq (qcdr (qcdr (qcdr pred))) nil)
(member (qcar pred) '(|isDomain| |ofCategory|))
(equal (qcar (qcdr pred)) (car sig))
(null (|member| (qcar (qcdr pred)) (cdr sig))))
- (and (null skip) (pairp pred) (eq (qcar pred) '|isDomain|)
- (pairp (qcdr pred)) (pairp (qcdr (qcdr pred)))
+ (and (null skip) (consp pred) (eq (qcar pred) '|isDomain|)
+ (consp (qcdr pred)) (consp (qcdr (qcdr pred)))
(eq (qcdr (qcdr (qcdr pred))) nil)
(equal (qcar (qcdr pred)) '*1)))
(setq oldList (|delete| pred oldList))
@@ -7134,9 +7122,9 @@ identifier in newvars in the expression x
(let (result)
(loop for x in oldList
do (when
- (and (pairp x)
+ (and (consp x)
(or (eq (qcar x) '|isDomain|) (eq (qcar x) '|ofCategory|))
- (pairp (qcdr x)) (pairp (qcdr (qcdr x)))
+ (consp (qcdr x)) (consp (qcdr (qcdr x)))
(eq (qcdr (qcdr (qcdr x))) nil))
(setq result (unionq result (|listOfPatternIds| (third x))))))
result))
@@ -7144,9 +7132,9 @@ identifier in newvars in the expression x
(loop for x in oldList
do
(cond
- ((and (pairp x)
+ ((and (consp x)
(or (eq (qcar x) '|ofCategory|) (eq (qcar x) '|isDomain|))
- (pairp (qcdr x)) (pairp (qcdr (qcdr x)))
+ (consp (qcdr x)) (consp (qcdr (qcdr x)))
(eq (qcdr (qcdr (qcdr x))) nil))
(setq indepvl (|listOfPatternIds| (second x)))
(setq depvl (|listOfPatternIds| (third x))))
@@ -7163,10 +7151,10 @@ identifier in newvars in the expression x
(loop while oldList do
(loop for x in oldList do
(cond
- ((and (pairp x)
+ ((and (consp x)
(or (eq (qcar x) '|ofCategory|) (eq (qcar x) '|isDomain|))
- (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(setq indepvl (|listOfPatternIds| (second x)))
(setq depvl (|listOfPatternIds| (third x))))
(t
@@ -7184,10 +7172,10 @@ identifier in newvars in the expression x
(setq oldList noldList))))
(loop for pred in newList do
(when
- (and (pairp pred)
+ (and (consp pred)
(or (eq (qcar pred) '|isDomain|) (eq (qcar x) '|ofCategory|))
- (pairp (qcdr pred))
- (pairp (qcdr (qcdr pred)))
+ (consp (qcdr pred))
+ (consp (qcdr (qcdr pred)))
(eq (qcdr (qcdr (qcdr pred))) nil))
(setq ids (|listOfPatternIds| (third pred)))
(when
@@ -7211,10 +7199,10 @@ identifier in newvars in the expression x
(findSub (x alist)
(cond
((null alist) nil)
- ((and (pairp alist) (pairp (qcar alist))
+ ((and (consp alist) (consp (qcar alist))
(eq (qcar (qcar alist)) '|isDomain|)
- (pairp (qcdr (qcar alist)))
- (pairp (qcdr (qcdr (qcar alist))))
+ (consp (qcdr (qcar alist)))
+ (consp (qcdr (qcdr (qcar alist))))
(eq (qcdr (qcdr (qcdr (qcar alist)))) nil)
(equal x (cadar alist)))
(caddar alist))
@@ -7233,14 +7221,14 @@ identifier in newvars in the expression x
(loop for y in (cdr x)
collect (fn y alist)))))))
(let (head tail nhead)
- (if (pairp u)
+ (if (consp u)
(progn
(setq head (qcar u))
(setq tail (qcdr u))
(setq nhead
(cond
- ((and (pairp head) (eq (qcar head) '|isDomain|)
- (pairp (qcdr head)) (pairp (qcdr (qcdr head)))
+ ((and (consp head) (eq (qcar head) '|isDomain|)
+ (consp (qcdr head)) (consp (qcdr (qcdr head)))
(eq (qcdr (qcdr (qcdr head))) nil))
(list '|isDomain| (second head)
(fn (third head) tail)))
@@ -7256,7 +7244,7 @@ identifier in newvars in the expression x
(defun |moveORsOutside| (p)
(let (q x)
(cond
- ((and (pairp p) (eq (qcar p) 'and))
+ ((and (consp p) (eq (qcar p) 'and))
(setq q
(prog (G167169)
(return
@@ -7268,7 +7256,7 @@ identifier in newvars in the expression x
((setq x
(let (tmp1)
(loop for r in q
- when (and (pairp r) (eq (qcar r) 'or))
+ when (and (consp r) (eq (qcar r) 'or))
do (setq tmp1 (or tmp1 r)))
tmp1))
(|moveORsOutside|
@@ -7283,11 +7271,11 @@ identifier in newvars in the expression x
;(defun |moveORsOutside| (p)
; (let (q s x tmp1)
; (cond
-; ((and (pairp p) (eq (qcar p) 'and))
+; ((and (consp p) (eq (qcar p) 'and))
; (setq q (loop for r in (qcdr p) collect (|moveORsOutside| r)))
; (setq tmp1
; (loop for r in q
-; when (and (pairp r) (eq (qcdr r) 'or))
+; when (and (consp r) (eq (qcdr r) 'or))
; collect r))
; (setq x (mapcar #'(lambda (a b) (or a b)) tmp1))
; (if x
@@ -7336,7 +7324,6 @@ Make pattern variable substitutions.
\end{chunk}
\defun{modemapPattern}{modemapPattern}
-\calls{modemapPattern}{pairp}
\calls{modemapPattern}{qcar}
\calls{modemapPattern}{qcdr}
\calls{modemapPattern}{rassoc}
@@ -7352,8 +7339,8 @@ Make pattern variable substitutions.
(maplist
#'(lambda (xTails)
(let ((x (car xTails)))
- (when (and (pairp x) (eq (qcar x) '|Union|)
- (pairp (qcdr x)) (pairp (qcdr (qcdr x)))
+ (when (and (consp x) (eq (qcar x) '|Union|)
+ (consp (qcdr x)) (consp (qcdr (qcdr x)))
(eq (qcdr (qcdr (qcdr x))) nil)
(equal (third x) "failed")
(equal xTails sig))
@@ -7815,13 +7802,13 @@ where item has form
(setq implementation (caddr item))
(setq kind
(cond
- ((and (pairp implementation) (pairp (qcdr implementation))
- (pairp (qcdr (qcdr implementation)))
+ ((and (consp implementation) (consp (qcdr implementation))
+ (consp (qcdr (qcdr implementation)))
(eq (qcdr (qcdr (qcdr implementation))) nil)
(progn (setq n (qcar (qcdr (qcdr implementation)))) t)
(|member| (setq eltEtc (qcar implementation)) '(const elt)))
eltEtc)
- ((pairp implementation)
+ ((consp implementation)
(setq impOp (qcar implementation))
(cond
((eq impop 'xlam) implementation)
@@ -7946,7 +7933,6 @@ where item has form
\calls{compDefineFunctor1}{NRTgenInitialAttributeAlist}
\calls{compDefineFunctor1}{NRTgetLocalIndex}
\calls{compDefineFunctor1}{compMakeDeclaration}
-\calls{compDefineFunctor1}{pairp}
\calls{compDefineFunctor1}{qcar}
\calls{compDefineFunctor1}{qcdr}
\calls{compDefineFunctor1}{augModemapsFromCategoryRep}
@@ -8046,9 +8032,9 @@ where item has form
(FindRep (cb)
(loop while cb do
(when (atom cb) (return nil))
- (when (and (pairp cb) (pairp (qcar cb)) (eq (qcar (qcar cb)) 'let)
- (pairp (qcdr (qcar cb))) (eq (qcar (qcdr (qcar cb))) '|Rep|)
- (pairp (qcdr (qcdr (qcar cb)))))
+ (when (and (consp cb) (consp (qcar cb)) (eq (qcar (qcar cb)) 'let)
+ (consp (qcdr (qcar cb))) (eq (qcar (qcdr (qcar cb))) '|Rep|)
+ (consp (qcdr (qcdr (qcar cb)))))
(return (caddar cb)))
(pop cb))))
(let (|$addForm| |$viewNames| |$functionStats| |$functorStats|
@@ -8168,12 +8154,12 @@ where item has form
(third (|compMakeDeclaration| (list '|:| '$ target) mode |$e|)))
(unless |$insideCategoryPackageIfTrue|
(if
- (and (pairp body) (eq (qcar body) '|add|)
- (pairp (qcdr body))
- (pairp (qcar (qcdr body)))
- (pairp (qcdr (qcdr body)))
+ (and (consp body) (eq (qcar body) '|add|)
+ (consp (qcdr body))
+ (consp (qcar (qcdr body)))
+ (consp (qcdr (qcdr body)))
(eq (qcdr (qcdr (qcdr body))) nil)
- (pairp (qcar (qcdr (qcdr body))))
+ (consp (qcar (qcdr (qcdr body))))
(eq (qcar (qcar (qcdr (qcdr body)))) 'capsule)
(member (qcar (qcar (qcdr body))) '(|List| |Vector|))
(equal (FindRep (qcdr (qcar (qcdr (qcdr body))))) (second body)))
@@ -8218,9 +8204,9 @@ where item has form
(cond
($lisplib
(setq |$lisplibKind|
- (if (and (pairp |$functorTarget|)
+ (if (and (consp |$functorTarget|)
(eq (qcar |$functorTarget|) 'category)
- (pairp (qcdr |$functorTarget|))
+ (consp (qcdr |$functorTarget|))
(nequal (qcar (qcdr |$functorTarget|)) '|domain|))
'|package|
'|domain|))
@@ -8399,12 +8385,12 @@ where item has form
(list (|bootStrapError| |$functorForm| /editfile) mode env)
(progn
(setq tt (|compOrCroak| form mode env))
- (if (and (pairp form) (member (qcar form) '(|add| capsule)))
+ (if (and (consp form) (member (qcar form) '(|add| capsule)))
tt
(progn
(setq |$NRTaddForm|
- (if (and (pairp form) (eq (qcar form) '|SubDomain|)
- (pairp (qcdr form)) (pairp (qcdr (qcdr form)))
+ (if (and (consp form) (eq (qcar form) '|SubDomain|)
+ (consp (qcdr form)) (consp (qcdr (qcdr form)))
(eq (qcdr (qcdr (qcdr form))) nil))
(qcar (qcdr form))
form))
@@ -8482,7 +8468,7 @@ where item has form
(loop for cvl in |$CheckVectorList| do
(unless (cdr cvl)
(if (and (null (|member| (caar cvl) |$formalArgList|))
- (pairp (|getmode| (caar cvl) |$env|))
+ (consp (|getmode| (caar cvl) |$env|))
(eq (qcar (|getmode| (caar cvl) |$env|)) '|Mapping|))
(push (list (caar cvl) (cadar cvl)) loc)
(push (list (caar cvl) (cadar cvl)) exp))))
@@ -8509,7 +8495,6 @@ where item has form
\calls{makeFunctorArgumentParameters}{assq}
\calls{makeFunctorArgumentParameters}{msubst}
\calls{makeFunctorArgumentParameters}{isCategoryForm}
-\calls{makeFunctorArgumentParameters}{pairp}
\calls{makeFunctorArgumentParameters}{qcar}
\calls{makeFunctorArgumentParameters}{qcdr}
\calls{makeFunctorArgumentParameters}{genDomainViewList0}
@@ -8526,7 +8511,7 @@ where item has form
(if ss
(progn
(loop for u in ss do (push (rest u) |$ConditionalOperators|))
- (if (and (pairp s) (eq (qcar s) '|Join|))
+ (if (and (consp s) (eq (qcar s) '|Join|))
(progn
(if (setq u (assq 'category ss))
(msubst (append u ss) u s)
@@ -8537,28 +8522,28 @@ where item has form
(fn (a s)
(declare (special |$CategoryFrame|))
(if (|isCategoryForm| s |$CategoryFrame|)
- (if (and (pairp s) (eq (qcar s) '|Join|))
+ (if (and (consp s) (eq (qcar s) '|Join|))
(|genDomainViewList0| a (rest s))
(list (|genDomainView| a s '|getDomainView|)))
(list a)))
(findExtras (a target)
(cond
- ((and (pairp target) (eq (qcar target) '|Join|))
+ ((and (consp target) (eq (qcar target) '|Join|))
(reduce #'|union|
(loop for x in (qcdr target)
collect (findExtras a x))))
- ((and (pairp target) (eq (qcar target) 'category))
+ ((and (consp target) (eq (qcar target) 'category))
(reduce #'|union|
(loop for x in (qcdr (qcdr target))
collect (findExtras1 a x))))))
(findExtras1 (a x)
(cond
- ((and (pairp x) (or (eq (qcar x) 'and)) (eq (qcar x) 'or))
+ ((and (consp x) (or (eq (qcar x) 'and)) (eq (qcar x) 'or))
(reduce #'|union|
(loop for y in (rest x) collect (findExtras1 a y))))
- ((and (pairp x) (eq (qcar x) 'if)
- (pairp (qcdr x)) (pairp (qcdr (qcdr x)))
- (pairp (qcdr (qcdr (qcdr x))))
+ ((and (consp x) (eq (qcar x) 'if)
+ (consp (qcdr x)) (consp (qcdr (qcdr x)))
+ (consp (qcdr (qcdr (qcdr x))))
(eq (qcdr (qcdr (qcdr (qcdr x)))) nil))
(|union| (findExtrasP a (second x))
(|union|
@@ -8566,22 +8551,22 @@ where item has form
(findExtras1 a (fourth x)))))))
(findExtrasP (a x)
(cond
- ((and (pairp x) (or (eq (qcar x) 'and)) (eq (qcar x) 'or))
+ ((and (consp x) (or (eq (qcar x) 'and)) (eq (qcar x) 'or))
(reduce #'|union|
(loop for y in (rest x) collect (findExtrasP a y))))
- ((and (pairp x) (eq (qcar x) '|has|)
- (pairp (qcdr x)) (pairp (qcdr (qcdr x)))
- (pairp (qcdr (qcdr (qcdr x))))
+ ((and (consp x) (eq (qcar x) '|has|)
+ (consp (qcdr x)) (consp (qcdr (qcdr x)))
+ (consp (qcdr (qcdr (qcdr x))))
(eq (qcdr (qcdr (qcdr (qcdr x)))) nil))
(|union| (findExtrasP a (second x))
(|union|
(findExtras1 a (third x))
(findExtras1 a (fourth x)))))
- ((and (pairp x) (eq (qcar x) '|has|)
- (pairp (qcdr x)) (equal (qcar (qcdr x)) a)
- (pairp (qcdr (qcdr x)))
+ ((and (consp x) (eq (qcar x) '|has|)
+ (consp (qcdr x)) (equal (qcar (qcdr x)) a)
+ (consp (qcdr (qcdr x)))
(eq (qcdr (qcdr (qcdr x))) nil)
- (pairp (qcar (qcdr (qcdr x))))
+ (consp (qcar (qcdr (qcdr x))))
(eq (qcar (qcar (qcdr (qcdr x)))) 'signature))
(list (third x)))))
@@ -8606,7 +8591,6 @@ where item has form
\end{chunk}
\defun{genDomainViewList}{genDomainViewList}
-\calls{genDomainViewList}{pairp}
\calls{genDomainViewList}{qcdr}
\calls{genDomainViewList}{isCategoryForm}
\calls{genDomainViewList}{genDomainView}
@@ -8617,7 +8601,7 @@ where item has form
(declare (special |$EmptyEnvironment|) (ignore firsttime))
(cond
((null catlist) nil)
- ((and (pairp catlist) (eq (qcdr catlist) nil)
+ ((and (consp catlist) (eq (qcdr catlist) nil)
(null (|isCategoryForm| (first catlist) |$EmptyEnvironment|)))
nil)
(t
@@ -8629,7 +8613,6 @@ where item has form
\defun{genDomainView}{genDomainView}
\calls{genDomainView}{genDomainOps}
-\calls{genDomainView}{pairp}
\calls{genDomainView}{qcar}
\calls{genDomainView}{qcdr}
\calls{genDomainView}{augModemapsFromCategory}
@@ -8642,12 +8625,12 @@ where item has form
(let (code cd)
(declare (special |$getDomainCode| |$e|))
(cond
- ((and (pairp c) (eq (qcar c) 'category) (pairp (qcdr c)))
+ ((and (consp c) (eq (qcar c) 'category) (consp (qcdr c)))
(|genDomainOps| name name c))
(t
(setq code
- (if (and (pairp c) (eq (qcar c) '|SubsetCategory|)
- (pairp (qcdr c)) (pairp (qcdr (qcdr c)))
+ (if (and (consp c) (eq (qcar c) '|SubsetCategory|)
+ (consp (qcdr c)) (consp (qcdr (qcdr c)))
(eq (qcdr (qcdr (qcdr c))) nil))
(second c)
c))
@@ -8705,7 +8688,6 @@ where item has form
\calls{mkOpVec}{length}
\calls{mkOpVec}{assq}
\calls{mkOpVec}{assoc}
-\calls{mkOpVec}{pairp}
\calls{mkOpVec}{qcar}
\calls{mkOpVec}{qcdr}
\calls{mkOpVec}{sublis}
@@ -8730,8 +8712,8 @@ where item has form
(setq u (assq (first opSig) oplist))
(setq tmp1 (|assoc| (second opSig) u))
(cond
- ((and (pairp tmp1) (pairp (qcdr tmp1))
- (pairp (qcdr (qcdr tmp1))) (pairp (qcdr (qcdr (qcdr tmp1))))
+ ((and (consp tmp1) (consp (qcdr tmp1))
+ (consp (qcdr (qcdr tmp1))) (consp (qcdr (qcdr (qcdr tmp1))))
(eq (qcdr (qcdr (qcdr (qcdr tmp1)))) nil)
(eq (qcar (qcdr (qcdr (qcdr tmp1)))) 'elt))
(setelt ops i (elt dom (second tmp1))))
@@ -8740,8 +8722,8 @@ where item has form
(setq tmp1
(|AssocBarGensym| (msubst (elt dom 0) '$ (second opSig)) noplist))
(cond
- ((and (pairp tmp1) (pairp (qcdr tmp1)) (pairp (qcdr (qcdr tmp1)))
- (pairp (qcdr (qcdr (qcdr tmp1))))
+ ((and (consp tmp1) (consp (qcdr tmp1)) (consp (qcdr (qcdr tmp1)))
+ (consp (qcdr (qcdr (qcdr tmp1))))
(eq (qcdr (qcdr (qcdr (qcdr tmp1)))) nil)
(eq (qcar (qcdr (qcdr (qcdr tmp1)))) 'elt))
(setelt ops i (elt dom (second tmp1))))
@@ -8756,12 +8738,11 @@ where item has form
\begin{chunk}{defun AssocBarGensym}
(defun |AssocBarGensym| (key z)
(loop for x in z
- do (when (and (pairp x) (|EqualBarGensym| key (car x))) (return x))))
+ do (when (and (consp x) (|EqualBarGensym| key (car x))) (return x))))
\end{chunk}
\defun{compDefWhereClause}{compDefWhereClause}
-\calls{compDefWhereClause}{pairp}
\calls{compDefWhereClause}{qcar}
\calls{compDefWhereClause}{qcdr}
\calls{compDefWhereClause}{getmode}
@@ -8785,21 +8766,21 @@ where item has form
(declare (special |$sigAlist|))
(cond
((atom x) x)
- ((and (pairp x) (eq (qcar x) '|:|) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ ((and (consp x) (eq (qcar x) '|:|) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(setq |$sigAlist|
(cons (cons (second x) (transformType (third x)))
|$sigAlist|))
x)
- ((and (pairp x) (eq (qcar x) '|Record|)) x)
+ ((and (consp x) (eq (qcar x) '|Record|)) x)
(t
(cons (first x)
(loop for y in (rest x)
collect (transformType y))))))
(removeSuchthat (x)
(declare (special |$predAlist|))
- (if (and (pairp x) (eq (qcar x) '|\||) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ (if (and (consp x) (eq (qcar x) '|\||) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(progn
(setq |$predAlist| (cons (cons (second x) (third x)) |$predAlist|))
(second x))
@@ -8914,7 +8895,6 @@ where item has form
\section{Code optimization routines}
\defun{optimizeFunctionDef}{optimizeFunctionDef}
-\calls{optimizeFunctionDef}{pairp}
\calls{optimizeFunctionDef}{qcar}
\calls{optimizeFunctionDef}{qcdr}
\calls{optimizeFunctionDef}{rplac}
@@ -8928,7 +8908,7 @@ where item has form
(labels (
(fn (x g)
(cond
- ((and (pairp x) (eq (qcar x) 'throw) (pairp (qcdr x))
+ ((and (consp x) (eq (qcar x) 'throw) (consp (qcdr x))
(equal (qcar (qcdr x)) g))
(|rplac| (car x) 'return)
(|rplac| (cdr x)
@@ -8941,8 +8921,8 @@ where item has form
(fn x g)
x)
(removeTopLevelCatch (body)
- (if (and (pairp body) (eq (qcar body) 'catch) (pairp (qcdr body))
- (pairp (qcdr (qcdr body))) (eq (qcdr (qcdr (qcdr body))) nil))
+ (if (and (consp body) (eq (qcar body) 'catch) (consp (qcdr body))
+ (consp (qcdr (qcdr body))) (eq (qcdr (qcdr (qcdr body))) nil))
(removeTopLevelCatch
(replaceThrowByReturn
(qcar (qcdr (qcdr body))) (qcar (qcdr body))))
@@ -8967,7 +8947,6 @@ where item has form
\end{chunk}
\defun{optimize}{optimize}
-\calls{optimize}{pairp}
\calls{optimize}{qcar}
\calls{optimize}{qcdr}
\calls{optimize}{optimize}
@@ -8986,8 +8965,8 @@ where item has form
((atom x) nil)
((eq (setq y (car x)) 'quote) nil)
((eq y 'closedfn) nil)
- ((and (pairp y) (pairp (qcar y)) (eq (qcar (qcar y)) 'xlam)
- (pairp (qcdr (qcar y))) (pairp (qcdr (qcdr (qcar y))))
+ ((and (consp y) (consp (qcar y)) (eq (qcar (qcar y)) 'xlam)
+ (consp (qcdr (qcar y))) (consp (qcdr (qcdr (qcar y))))
(eq (qcdr (qcdr (qcdr (qcar y)))) nil))
(setq argl (qcar (qcdr (qcar y))))
(setq body (qcar (qcdr (qcdr (qcar y)))))
@@ -9029,15 +9008,14 @@ where item has form
\calls{optXLAMCond}{optCONDtail}
\calls{optXLAMCond}{optPredicateIfTrue}
\calls{optXLAMCond}{optXLAMCond}
-\calls{optXLAMCond}{pairp}
\calls{optXLAMCond}{qcar}
\calls{optXLAMCond}{qcdr}
\calls{optXLAMCond}{rplac}
\begin{chunk}{defun optXLAMCond}
(defun |optXLAMCond| (x)
(cond
- ((and (pairp x) (eq (qcar x) 'cond) (pairp (qcdr x))
- (pairp (qcar (qcdr x))) (pairp (qcdr (qcar (qcdr x))))
+ ((and (consp x) (eq (qcar x) 'cond) (consp (qcdr x))
+ (consp (qcar (qcdr x))) (consp (qcdr (qcar (qcdr x))))
(eq (qcdr (qcdr (qcar (qcdr x)))) nil))
(if (|optPredicateIfTrue| (qcar (qcar (qcdr x))))
(qcar (qcdr (qcar (qcdr x))))
@@ -9082,8 +9060,8 @@ simple kind of compile-time type evaluation.
(defun |optPredicateIfTrue| (p)
(declare (special |$BasicPredicates|))
(cond
- ((and (pairp p) (eq (qcar p) 'quote)) T)
- ((and (pairp p) (pairp (qcdr p)) (eq (qcdr (qcdr p)) nil)
+ ((and (consp p) (eq (qcar p) 'quote)) T)
+ ((and (consp p) (consp (qcdr p)) (eq (qcdr (qcdr p)) nil)
(member (qcar p) |$BasicPredicates|) (funcall (qcar p) (qcar (qcdr p))))
t)
(t nil)))
@@ -9103,9 +9081,9 @@ simple kind of compile-time type evaluation.
(cond
((eq b '|noBranch|) (list 'cond (list (list 'null a ) c)))
((eq c '|noBranch|) (list 'cond (list a b)))
- ((and (pairp c) (eq (qcar c) 'if))
+ ((and (consp c) (eq (qcar c) 'if))
(cons 'cond (cons (list a b) (cdr (|optIF2COND| c)))))
- ((and (pairp c) (eq (qcar c) 'cond))
+ ((and (consp c) (eq (qcar c) 'cond))
(cons 'cond (cons (list a b) (qcdr c))))
(t
(list 'cond (list a b) (list |$true| c))))))
@@ -9189,14 +9167,14 @@ optPackageCall.
(setq a (cdr tmp1))
(cond
((atom fn) (rplac (cdr x) a) (rplac (car x) fn))
- ((and (pairp fn) (eq (qcar fn) 'pac)) (|optPackageCall| x fn a))
- ((and (pairp fn) (eq (qcar fn) '|applyFun|)
- (pairp (qcdr fn)) (eq (qcdr (qcdr fn)) nil))
+ ((and (consp fn) (eq (qcar fn) 'pac)) (|optPackageCall| x fn a))
+ ((and (consp fn) (eq (qcar fn) '|applyFun|)
+ (consp (qcdr fn)) (eq (qcdr (qcdr fn)) nil))
(setq name (qcar (qcdr fn)))
(rplac (car x) 'spadcall)
(rplac (cdr x) (append a (cons name nil)))
x)
- ((and (pairp fn) (pairp (qcdr fn)) (pairp (qcdr (qcdr fn)))
+ ((and (consp fn) (consp (qcdr fn)) (consp (qcdr (qcdr fn)))
(eq (qcdr (qcdr (qcdr fn))) nil)
(member (qcar fn) '(elt qrefelt const)))
(setq q (qcar fn))
@@ -9249,8 +9227,8 @@ optPackageCall.
(when z
(setq zp (car z))
(setq z (cdr x))
- (if (and (pairp zp) (eq (qcar zp) 'let) (pairp (qcdr zp))
- (equal (qcar (qcdr zp)) a) (pairp (qcdr (qcdr zp))))
+ (if (and (consp zp) (eq (qcar zp) 'let) (consp (qcdr zp))
+ (equal (qcar (qcdr zp)) a) (consp (qcdr (qcdr zp))))
(qcar (qcdr (qcdr zp)))
(lookup a z))))))
(let (tmp1 op y prop yy)
@@ -9305,9 +9283,9 @@ optPackageCall.
((setq fn (getl (|compileTimeBindingOf| (car (elt yval n))) '|SPADreplace|))
(|rplac| (cdr x) (cdar x))
(|rplac| (car x) fn)
- (when (and (pairp fn) (eq (qcar fn) 'xlam))
+ (when (and (consp fn) (eq (qcar fn) 'xlam))
(setq x (car (|optimize| (list x)))))
- (if (and (pairp x) (eq (qcar x) 'equal) (progn (setq args (qcdr x)) t))
+ (if (and (consp x) (eq (qcar x) 'equal) (progn (setq args (qcdr x)) t))
(rplacw x (def-equal args))
x))
(t
@@ -9338,7 +9316,6 @@ optPackageCall.
\end{chunk}
\defun{optCallEval}{optCallEval}
-\calls{optCallEval}{pairp}
\calls{optCallEval}{qcar}
\calls{optCallEval}{List}
\calls{optCallEval}{Integer}
@@ -9350,15 +9327,15 @@ optPackageCall.
\begin{chunk}{defun optCallEval}
(defun |optCallEval| (u)
(cond
- ((and (pairp u) (eq (qcar u) '|List|))
+ ((and (consp u) (eq (qcar u) '|List|))
(|List| (|Integer|)))
- ((and (pairp u) (eq (qcar u) '|Vector|))
+ ((and (consp u) (eq (qcar u) '|Vector|))
(|Vector| (|Integer|)))
- ((and (pairp u) (eq (qcar u) '|PrimitiveArray|))
+ ((and (consp u) (eq (qcar u) '|PrimitiveArray|))
(|PrimitiveArray| (|Integer|)))
- ((and (pairp u) (eq (qcar u) '|FactoredForm|))
+ ((and (consp u) (eq (qcar u) '|FactoredForm|))
(|FactoredForm| (|Integer|)))
- ((and (pairp u) (eq (qcar u) '|Matrix|))
+ ((and (consp u) (eq (qcar u) '|Matrix|))
(|Matrix| (|Integer|)))
(t
(|eval| u))))
@@ -9377,9 +9354,9 @@ optPackageCall.
(defun |optSEQ| (arg)
(labels (
(tryToRemoveSEQ (z)
- (if (and (pairp z) (eq (qcar z) 'seq) (pairp (qcdr z))
- (eq (qcdr (qcdr z)) nil) (pairp (qcar (qcdr z)))
- (pairp (qcdr (qcar (qcdr z))))
+ (if (and (consp z) (eq (qcar z) 'seq) (consp (qcdr z))
+ (eq (qcdr (qcdr z)) nil) (consp (qcar (qcdr z)))
+ (consp (qcdr (qcar (qcdr z))))
(eq (qcdr (qcdr (qcar (qcdr z)))) nil)
(member (qcar (qcar (qcdr z))) '(exit return throw)))
(qcar (qcdr (qcar (qcdr z))))
@@ -9389,13 +9366,13 @@ optPackageCall.
(setq transform
(loop for x in z
while
- (and (pairp x) (eq (qcar x) 'cond) (pairp (qcdr x))
- (eq (qcdr (qcdr x)) nil) (pairp (qcar (qcdr x)))
- (pairp (qcdr (qcar (qcdr x))))
+ (and (consp x) (eq (qcar x) 'cond) (consp (qcdr x))
+ (eq (qcdr (qcdr x)) nil) (consp (qcar (qcdr x)))
+ (consp (qcdr (qcar (qcdr x))))
(eq (qcdr (qcdr (qcar (qcdr x)))) nil)
- (pairp (qcar (qcdr (qcar (qcdr x)))))
+ (consp (qcar (qcdr (qcar (qcdr x)))))
(eq (qcar (qcar (qcdr (qcar (qcdr x))))) 'exit)
- (pairp (qcdr (qcar (qcdr (qcar (qcdr x))))))
+ (consp (qcdr (qcar (qcdr (qcar (qcdr x))))))
(eq (qcdr (qcdr (qcar (qcdr (qcar (qcdr x)))))) nil))
collect
(list (qcar (qcar (qcdr x)))
@@ -9413,8 +9390,8 @@ optPackageCall.
(let (g x r)
(cond
((null z) nil)
- ((and (pairp z) (pairp (qcar z)) (eq (qcar (qcar z)) 'let)
- (pairp (qcdr (qcar z))) (pairp (qcdr (qcdr (qcar z))))
+ ((and (consp z) (consp (qcar z)) (eq (qcar (qcar z)) 'let)
+ (consp (qcdr (qcar z))) (consp (qcdr (qcdr (qcar z))))
(gensymp (qcar (qcdr (qcar z))))
(> 2 (|numOfOccurencesOf| (qcar (qcdr (qcar z))) (qcdr z))))
(setq g (qcar (qcdr (qcar z))))
@@ -9441,8 +9418,8 @@ optPackageCall.
(defun |optEQ| (u)
(let (z r)
(cond
- ((and (pairp u) (eq (qcar u) 'eq) (pairp (qcdr u))
- (pairp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
+ ((and (consp u) (eq (qcar u) 'eq) (consp (qcdr u))
+ (consp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
(setq z (qcar (qcdr u)))
(setq r (qcar (qcdr (qcdr u))))
; That undoes some weird work in Boolean to do with the definition of true
@@ -9465,7 +9442,7 @@ optPackageCall.
(defun |optMINUS| (u)
(let (v)
(cond
- ((and (pairp u) (eq (qcar u) 'minus) (pairp (qcdr u))
+ ((and (consp u) (eq (qcar u) 'minus) (consp (qcdr u))
(eq (qcdr (qcdr u)) nil))
(setq v (qcar (qcdr u)))
(cond ((numberp v) (- v)) (t u)))
@@ -9485,7 +9462,7 @@ optPackageCall.
(defun |optQSMINUS| (u)
(let (v)
(cond
- ((and (pairp u) (eq (qcar u) 'qsminus) (pairp (qcdr u))
+ ((and (consp u) (eq (qcar u) 'qsminus) (consp (qcdr u))
(eq (qcdr (qcdr u)) nil))
(setq v (qcar (qcdr u)))
(cond ((numberp v) (- v)) (t u)))
@@ -9505,7 +9482,7 @@ optPackageCall.
(defun |opt-| (u)
(let (v)
(cond
- ((and (pairp u) (eq (qcar u) '-) (pairp (qcdr u))
+ ((and (consp u) (eq (qcar u) '-) (consp (qcdr u))
(eq (qcdr (qcdr u)) NIL))
(setq v (qcar (qcdr u)))
(cond ((numberp v) (- v)) (t u)))
@@ -9525,8 +9502,8 @@ optPackageCall.
(defun |optLESSP| (u)
(let (a b)
(cond
- ((and (pairp u) (eq (qcar u) 'lessp) (pairp (qcdr u))
- (pairp (qcdr (qcdr u)))
+ ((and (consp u) (eq (qcar u) 'lessp) (consp (qcdr u))
+ (consp (qcdr (qcdr u)))
(eq (qcdr (qcdr (qcdr u))) nil))
(setq a (qcar (qcdr u)))
(setq b (qcar (qcdr (qcdr u))))
@@ -9555,20 +9532,20 @@ optPackageCall.
(cond
; last arg is function/env, but may be a form
((null |$InteractiveMode|) form)
- ((and (pairp argl)
+ ((and (consp argl)
(progn (setq tmp1 (reverse argl)) t)
- (pairp tmp1))
+ (consp tmp1))
(setq fun (qcar tmp1))
(setq argl (qcdr tmp1))
(setq argl (nreverse argl))
(cond
- ((and (pairp fun)
+ ((and (consp fun)
(or (eq (qcar fun) 'elt) (eq (qcar fun) 'lispelt))
(progn
- (and (pairp (qcdr fun))
+ (and (consp (qcdr fun))
(progn
(setq dom (qcar (qcdr fun)))
- (and (pairp (qcdr (qcdr fun)))
+ (and (consp (qcdr (qcdr fun)))
(eq (qcdr (qcdr (qcdr fun))) nil)
(progn
(setq slot (qcar (qcdr (qcdr fun))))
@@ -9601,7 +9578,6 @@ optPackageCall.
\end{chunk}
\defun{optCatch}{optCatch}
-\calls{optCatch}{pairp}
\calls{optCatch}{qcar}
\calls{optCatch}{qcdr}
\calls{optCatch}{rplac}
@@ -9613,7 +9589,7 @@ optPackageCall.
(changeThrowToExit (s g)
(cond
((or (atom s) (member (car s) '(quote seq repeat collect))) nil)
- ((and (pairp s) (eq (qcar s) 'throw) (pairp (qcdr s))
+ ((and (consp s) (eq (qcar s) 'throw) (consp (qcdr s))
(equal (qcar (qcdr s)) g))
(|rplac| (car s) 'exit)
(|rplac| (cdr s) (qcdr (qcdr s))))
@@ -9622,7 +9598,7 @@ optPackageCall.
(changeThrowToExit (cdr s) g))))
(hasNoThrows (a g)
(cond
- ((and (pairp a) (eq (qcar a) 'throw) (pairp (qcdr a))
+ ((and (consp a) (eq (qcar a) 'throw) (consp (qcdr a))
(equal (qcar (qcdr a)) g))
nil)
((atom a) t)
@@ -9633,8 +9609,8 @@ optPackageCall.
(let (u)
(cond
((or (atom s) (eq (car s) 'quote)) nil)
- ((and (pairp s) (eq (qcar s) 'throw) (pairp (qcdr s))
- (equal (qcar (qcdr s)) g) (pairp (qcdr (qcdr s)))
+ ((and (consp s) (eq (qcar s) 'throw) (consp (qcdr s))
+ (equal (qcar (qcdr s)) g) (consp (qcdr (qcdr s)))
(eq (qcdr (qcdr (qcdr s))) nil))
(setq u (qcar (qcdr (qcdr s))))
(changeThrowToGo u g)
@@ -9652,12 +9628,12 @@ optPackageCall.
((atom a) a)
(t
(cond
- ((and (pairp a) (eq (qcar a) 'seq) (pairp (qcdr a))
+ ((and (consp a) (eq (qcar a) 'seq) (consp (qcdr a))
(progn (setq tmp2 (reverse (qcdr a))) t)
- (pairp tmp2) (pairp (qcar tmp2)) (eq (qcar (qcar tmp2)) 'throw)
- (pairp (qcdr (qcar tmp2)))
+ (consp tmp2) (consp (qcar tmp2)) (eq (qcar (qcar tmp2)) 'throw)
+ (consp (qcdr (qcar tmp2)))
(equal (qcar (qcdr (qcar tmp2))) g)
- (pairp (qcdr (qcdr (qcar tmp2))))
+ (consp (qcdr (qcdr (qcar tmp2))))
(eq (qcdr (qcdr (qcdr (qcar tmp2)))) nil))
(setq u (qcar (qcdr (qcdr (qcar tmp2)))))
(setq s (qcdr tmp2))
@@ -9687,7 +9663,6 @@ optPackageCall.
\end{chunk}
\defun{optCond}{optCond}
-\calls{optCond}{pairp}
\calls{optCond}{qcar}
\calls{optCond}{qcdr}
\calls{optCond}{rplacd}
@@ -9699,41 +9674,41 @@ optPackageCall.
(let (z p1 p2 c3 c1 c2 a result)
(setq z (cdr x))
(when
- (and (pairp z) (pairp (qcdr z)) (eq (qcdr (qcdr z)) nil)
- (pairp (qcar (qcdr z))) (pairp (qcdr (qcar (qcdr z))))
+ (and (consp z) (consp (qcdr z)) (eq (qcdr (qcdr z)) nil)
+ (consp (qcar (qcdr z))) (consp (qcdr (qcar (qcdr z))))
(eq (qcdr (qcdr (qcar (qcdr z)))) nil)
(|TruthP| (qcar (qcar (qcdr z))))
- (pairp (qcar (qcdr (qcar (qcdr z)))))
+ (consp (qcar (qcdr (qcar (qcdr z)))))
(eq (qcar (qcar (qcdr (qcar (qcdr z))))) 'cond))
(rplacd (cdr x) (qcdr (qcar (qcdr (qcar (qcdr z)))))))
(cond
- ((and (pairp z) (pairp (qcar z)) (pairp (qcdr z)) (pairp (qcar (qcdr z))))
+ ((and (consp z) (consp (qcar z)) (consp (qcdr z)) (consp (qcar (qcdr z))))
(setq p1 (qcar (qcar z)))
(setq c1 (qcdr (qcar z)))
(setq p2 (qcar (qcar (qcdr z))))
(setq c2 (qcdr (qcar (qcdr z))))
(when
- (or (and (pairp p1) (eq (qcar p1) 'null) (pairp (qcdr p1))
+ (or (and (consp p1) (eq (qcar p1) 'null) (consp (qcdr p1))
(eq (qcdr (qcdr p1)) nil)
(equal (qcar (qcdr p1)) p2))
- (and (pairp p2) (eq (qcar p2) 'null) (pairp (qcdr p2))
+ (and (consp p2) (eq (qcar p2) 'null) (consp (qcdr p2))
(eq (qcdr (qcdr p2)) nil)
(equal (qcar (qcdr p2)) p1)))
(setq z (list (cons p1 c1) (cons ''t c2)))
(rplacd x z))
(when
- (and (pairp c1) (eq (qcdr c1) nil) (equal (qcar c1) 'nil)
+ (and (consp c1) (eq (qcdr c1) nil) (equal (qcar c1) 'nil)
(equal p2 ''t) (equal (car c2) ''t))
- (if (and (pairp p1) (eq (qcar p1) 'null) (pairp (qcdr p1))
+ (if (and (consp p1) (eq (qcar p1) 'null) (consp (qcdr p1))
(eq (qcdr (qcdr p1)) nil))
(setq result (qcar (qcdr p1)))
(setq result (list 'null p1))))))
(if result
result
(cond
- ((and (pairp z) (pairp (qcar z)) (pairp (qcdr z)) (pairp (qcar (qcdr z)))
- (pairp (qcdr (qcdr z))) (eq (qcdr (qcdr (qcdr z))) nil)
- (pairp (qcar (qcdr (qcdr z))))
+ ((and (consp z) (consp (qcar z)) (consp (qcdr z)) (consp (qcar (qcdr z)))
+ (consp (qcdr (qcdr z))) (eq (qcdr (qcdr (qcdr z))) nil)
+ (consp (qcar (qcdr (qcdr z))))
(|TruthP| (qcar (qcar (qcdr (qcdr z))))))
(setq p1 (qcar (qcar z)))
(setq c1 (qcdr (qcar z)))
@@ -9751,9 +9726,9 @@ optPackageCall.
(do ((y z (cdr y)))
((atom y) nil)
(do ()
- ((null (and (pairp y) (pairp (qcar y)) (pairp (qcdr (qcar y)))
- (eq (qcdr (qcdr (qcar y))) nil) (pairp (qcdr y))
- (pairp (qcar (qcdr y))) (pairp (qcdr (qcar (qcdr y))))
+ ((null (and (consp y) (consp (qcar y)) (consp (qcdr (qcar y)))
+ (eq (qcdr (qcdr (qcar y))) nil) (consp (qcdr y))
+ (consp (qcar (qcdr y))) (consp (qcdr (qcar (qcdr y))))
(eq (qcdr (qcdr (qcar (qcdr y)))) nil)
(|EqualBarGensym| (qcar (qcdr (qcar y)))
(qcar (qcdr (qcar (qcdr y)))))))
@@ -9783,8 +9758,8 @@ optPackageCall.
(progn
(setq |$GensymAssoc| (cons (cons x y) |$GensymAssoc|))
t)))
- ((null x) (and (pairp y) (eq (qcdr y) nil) (gensymp (qcar y))))
- ((null y) (and (pairp x) (eq (qcdr x) nil) (gensymp (qcar x))))
+ ((null x) (and (consp y) (eq (qcdr y) nil) (gensymp (qcar y))))
+ ((null y) (and (consp x) (eq (qcdr x) nil) (gensymp (qcar x))))
((or (atom x) (atom y)) nil)
(t
(and (fn (car x) (car y))
@@ -9810,7 +9785,7 @@ optPackageCall.
(let (u)
(setq u (cdr arg))
(cond
- ((and (pairp u) (eq (qcdr u) nil)) (list 'list (qcar u)))
+ ((and (consp u) (eq (qcdr u) nil)) (list 'list (qcar u)))
((eql (|#| u) 2) (cons 'cons u))
(t (cons 'vector u)))))
@@ -9908,7 +9883,6 @@ optPackageCall.
\calls{addDomain}{isLiteral}
\calls{addDomain}{addNewDomain}
\calls{addDomain}{getmode}
-\calls{addDomain}{pairp}
\calls{addDomain}{isCategoryForm}
\calls{addDomain}{isFunctor}
\calls{addDomain}{constructor?}
@@ -9934,8 +9908,8 @@ optPackageCall.
((|domainMember| domain (|getDomainsInScope| env)) env)
((and (progn
(setq tmp1 (|getmode| name env))
- (and (pairp tmp1) (eq (qcar tmp1) '|Mapping|)
- (pairp (qcdr tmp1))))
+ (and (consp tmp1) (eq (qcar tmp1) '|Mapping|)
+ (consp (qcdr tmp1))))
(|isCategoryForm| (second tmp1) env))
(|addNewDomain| domain env))
((or (|isFunctor| name) (|constructor?| name))
@@ -9949,14 +9923,13 @@ optPackageCall.
\end{chunk}
\defun{unknownTypeError}{unknownTypeError}
-\calls{unknownTypeError}{pairp}
\calls{unknownTypeError}{qcar}
\calls{unknownTypeError}{stackSemanticError}
\begin{chunk}{defun unknownTypeError}
(defun |unknownTypeError| (name)
(let (op)
(setq name
- (if (and (pairp name) (setq op (qcar name)))
+ (if (and (consp name) (setq op (qcar name)))
op
name))
(|stackSemanticError| (list '|%b| name '|%d| '|is not a known type|) nil)))
@@ -10090,7 +10063,7 @@ The way XLAMs work:
(setq env (|addNewDomain| (car u) env)))
(when (setq innerDom (|listOrVectorElementMode| name))
(setq env (|addDomain| innerDom env)))
- (when (and (pairp name) (eq (qcar name) '|Union|))
+ (when (and (consp name) (eq (qcar name) '|Union|))
(dolist (d (|stripUnionTags| (qcdr name)))
(setq env (|addDomain| d env))))
(|augModemapsFromDomain1| name functorForm env)))))
@@ -10147,7 +10120,6 @@ The way XLAMs work:
\calls{addConstructorModemaps}{putDomainsInScope}
\calls{addConstructorModemaps}{getl}
\calls{addConstructorModemaps}{msubst}
-\calls{addConstructorModemaps}{pairp}
\calls{addConstructorModemaps}{qcar}
\calls{addConstructorModemaps}{qcdr}
\calls{addConstructorModemaps}{addModemap}
@@ -10167,8 +10139,8 @@ The way XLAMs work:
(setq op (first item))
(setq sig (second item))
(setq opcode (third item))
- (when (and (pairp opcode) (pairp (qcdr opcode))
- (pairp (qcdr (qcdr opcode)))
+ (when (and (consp opcode) (consp (qcdr opcode))
+ (consp (qcdr (qcdr opcode)))
(eq (qcdr (qcdr (qcdr opcode))) nil)
(eq (qcar opcode) 'elt))
(setq nsig (msubst '$$$ name sig))
@@ -10219,7 +10191,6 @@ The way XLAMs work:
\end{chunk}
\defun{getModemapList}{getModemapList}
-\calls{getModemapList}{pairp}
\calls{getModemapList}{qcar}
\calls{getModemapList}{qcdr}
\calls{getModemapList}{getModemapListFromDomain}
@@ -10229,8 +10200,8 @@ The way XLAMs work:
(defun |getModemapList| (op numOfArgs env)
(let (result)
(cond
- ((and (pairp op) (eq (qcar op) '|elt|) (pairp (qcdr op))
- (pairp (qcdr (qcdr op))) (eq (qcdr (qcdr (qcdr op))) nil))
+ ((and (consp op) (eq (qcar op) '|elt|) (consp (qcdr op))
+ (consp (qcdr (qcdr op))) (eq (qcdr (qcdr (qcdr op))) nil))
(|getModemapListFromDomain| (third op) numOfArgs (second op) env))
(t
(dolist (term (|get| op '|modemap| env) (nreverse0 result))
@@ -10285,7 +10256,6 @@ The way XLAMs work:
\defun{addEltModemap}{addEltModemap}
This is a hack to change selectors from strings to identifiers; and to
add flag identifiers as literals in the environment
-\calls{addEltModemap}{pairp}
\calls{addEltModemap}{qcar}
\calls{addEltModemap}{qcdr}
\calls{addEltModemap}{makeLiteral}
@@ -10298,7 +10268,7 @@ add flag identifiers as literals in the environment
(let (tmp1 v sel lt id)
(declare (special |$e| |$insideCapsuleFunctionIfTrue|))
(cond
- ((and (eq op '|elt|) (pairp sig))
+ ((and (eq op '|elt|) (consp sig))
(setq tmp1 (reverse sig))
(setq sel (qcar tmp1))
(setq lt (nreverse (qcdr tmp1)))
@@ -10310,7 +10280,7 @@ add flag identifiers as literals in the environment
(setq env (|makeLiteral| id env)))
(|addModemap1| op mc (append lt (list id)) pred fn env))
(t (|addModemap1| op mc sig pred fn env))))
- ((and (eq op '|setelt|) (pairp sig))
+ ((and (eq op '|setelt|) (consp sig))
(setq tmp1 (reverse sig))
(setq v (qcar tmp1))
(setq sel (qcar (qcdr tmp1)))
@@ -10329,7 +10299,6 @@ add flag identifiers as literals in the environment
\defun{mkNewModemapList}{mkNewModemapList}
\calls{mkNewModemapList}{member}
\calls{mkNewModemapList}{assoc}
-\calls{mkNewModemapList}{pairp}
\calls{mkNewModemapList}{qcar}
\calls{mkNewModemapList}{qcdr}
\calls{mkNewModemapList}{mergeModemap}
@@ -10347,9 +10316,9 @@ add flag identifiers as literals in the environment
(cond
((|member| entry curModemapList) curModemapList)
((and (setq oldMap (|assoc| map curModemapList))
- (pairp oldMap) (pairp (qcdr oldMap))
- (pairp (qcar (qcdr oldMap)))
- (pairp (qcdr (qcar (qcdr oldMap))))
+ (consp oldMap) (consp (qcdr oldMap))
+ (consp (qcar (qcdr oldMap)))
+ (consp (qcdr (qcar (qcdr oldMap))))
(eq (qcdr (qcdr (qcar (qcdr oldMap)))) nil)
(equal (qcar (qcdr (qcar (qcdr oldMap)))) fn))
(setq opred (qcar (qcar (qcdr oldMap))))
@@ -10432,13 +10401,12 @@ add flag identifiers as literals in the environment
\defun{TruthP}{TruthP}
\calls{TruthP}{qcar}
-\calls{TruthP}{pairp}
\begin{chunk}{defun TruthP}
(defun |TruthP| (x)
(cond
((null x) nil)
((eq x t) t)
- ((and (pairp x) (eq (qcar x) 'quote)) t)
+ ((and (consp x) (eq (qcar x) 'quote)) t)
(t nil)))
\end{chunk}
@@ -10561,7 +10529,7 @@ add flag identifiers as literals in the environment
(setq result (or result (redefined op u))))))
(redefined (opname u)
(let (op z result)
- (when (pairp u)
+ (when (consp u)
(setq op (qcar u))
(setq z (qcdr u))
(cond
@@ -10642,7 +10610,6 @@ add flag identifiers as literals in the environment
\end{chunk}
\defun{addModemap0}{addModemap0}
-\calls{addModemap0}{pairp}
\calls{addModemap0}{qcar}
\calls{addModemap0}{addEltModemap}
\calls{addModemap0}{addModemap1}
@@ -10651,7 +10618,7 @@ add flag identifiers as literals in the environment
(defun |addModemap0| (op mc sig pred fn env)
(declare (special |$functorForm|))
(cond
- ((and (pairp |$functorForm|)
+ ((and (consp |$functorForm|)
(eq (qcar |$functorForm|) '|CategoryDefaults|)
(eq mc '$))
env)
@@ -10725,7 +10692,6 @@ in the body of the add.
\calls{compAdd}{qcdr}
\calls{compAdd}{qcar}
\calls{compAdd}{compSubDomain1}
-\calls{compAdd}{pairp}
\calls{compAdd}{nreverse0}
\calls{compAdd}{NRTgetLocalIndex}
\calls{compAdd}{compTuple2Record}
@@ -10748,7 +10714,7 @@ in the body of the add.
(cond
((eq |$bootStrapMode| t)
(cond
- ((and (pairp |$addForm|) (eq (qcar |$addForm|) '|@Tuple|))
+ ((and (consp |$addForm|) (eq (qcar |$addForm|) '|@Tuple|))
(setq code nil))
(t
(setq tmp3 (|comp| |$addForm| mode env))
@@ -10767,8 +10733,8 @@ in the body of the add.
(t
(setq |$addFormLhs| |$addForm|)
(cond
- ((and (pairp |$addForm|) (eq (qcar |$addForm|) '|SubDomain|)
- (pairp (qcdr |$addForm|)) (pairp (qcdr (qcdr |$addForm|)))
+ ((and (consp |$addForm|) (eq (qcar |$addForm|) '|SubDomain|)
+ (consp (qcdr |$addForm|)) (consp (qcdr (qcdr |$addForm|)))
(eq (qcdr (qcdr (qcdr |$addForm|))) nil))
(setq domainForm (second |$addForm|))
(setq predicate (third |$addForm|))
@@ -10782,13 +10748,13 @@ in the body of the add.
(setq env (third tmp3)) tmp3)
(t
(setq |$packagesUsed|
- (if (and (pairp |$addForm|) (eq (qcar |$addForm|) '|@Tuple|))
+ (if (and (consp |$addForm|) (eq (qcar |$addForm|) '|@Tuple|))
(append (qcdr |$addForm|) |$packagesUsed|)
(cons |$addForm| |$packagesUsed|)))
(setq |$NRTaddForm| |$addForm|)
(setq tmp3
(cond
- ((and (pairp |$addForm|) (eq (qcar |$addForm|) '|@Tuple|))
+ ((and (consp |$addForm|) (eq (qcar |$addForm|) '|@Tuple|))
(setq |$NRTaddForm|
(cons '|@Tuple|
(dolist (x (cdr |$addForm|) (nreverse0 tmp4))
@@ -10880,7 +10846,7 @@ in the body of the add.
\begin{chunk}{defun processFunctor}
(defun |processFunctor| (form signature data localParList e)
(cond
- ((and (pairp form) (eq (qcdr form) nil)
+ ((and (consp form) (eq (qcdr form) nil)
(eq (qcar form) '|CategoryDefaults|))
(|error| '|CategoryDefaults is a reserved name|))
(t (|buildFunctor| form signature data localParList e))))
@@ -10937,7 +10903,6 @@ Since we can't be sure we take the least disruptive course of action.
\end{chunk}
\defun{doIt}{doIt}
-\calls{doIt}{pairp}
\calls{doIt}{qcar}
\calls{doIt}{qcdr}
\calls{doIt}{lastnode}
@@ -10994,13 +10959,13 @@ Since we can't be sure we take the least disruptive course of action.
|$functorLocalParameters| |$NonMentionableDomainNames|))
(setq $genno 0)
(cond
- ((and (pairp item) (eq (qcar item) 'seq) (pairp (qcdr item))
+ ((and (consp item) (eq (qcar item) 'seq) (consp (qcdr item))
(progn (setq tmp6 (reverse (qcdr item))) t)
- (pairp tmp6) (pairp (qcar tmp6))
+ (consp tmp6) (consp (qcar tmp6))
(eq (qcar (qcar tmp6)) '|exit|)
- (pairp (qcdr (qcar tmp6)))
+ (consp (qcdr (qcar tmp6)))
(equal (qcar (qcdr (qcar tmp6))) 1)
- (pairp (qcdr (qcdr (qcar tmp6))))
+ (consp (qcdr (qcdr (qcar tmp6))))
(eq (qcdr (qcdr (qcdr (qcar tmp6)))) nil))
(setq x (qcar (qcdr (qcdr (qcar tmp6)))))
(setq z (qcdr tmp6))
@@ -11015,19 +10980,19 @@ Since we can't be sure we take the least disruptive course of action.
(rplaca item (car u))
(rplacd item (cdr u))
(|doIt| item |$predl|))
- ((and (pairp item) (eq (qcar item) 'let) (pairp (qcdr item))
- (pairp (qcdr (qcdr item))))
+ ((and (consp item) (eq (qcar item) 'let) (consp (qcdr item))
+ (consp (qcdr (qcdr item))))
(setq lhs (qcar (qcdr item)))
(setq rhs (qcar (qcdr (qcdr item))))
(cond
((null (progn
(setq tmp2 (|compOrCroak| item |$EmptyMode| |$e|))
- (and (pairp tmp2)
+ (and (consp tmp2)
(progn
(setq code (qcar tmp2))
- (and (pairp (qcdr tmp2))
+ (and (consp (qcdr tmp2))
(progn
- (and (pairp (qcdr (qcdr tmp2)))
+ (and (consp (qcdr (qcdr tmp2)))
(eq (qcdr (qcdr (qcdr tmp2))) nil)
(PROGN
(setq |$e| (qcar (qcdr (qcdr tmp2))))
@@ -11035,15 +11000,15 @@ Since we can't be sure we take the least disruptive course of action.
(|stackSemanticError|
(cons '|cannot compile assigned value to| (|bright| lhs))
nil))
- ((null (and (pairp code) (eq (qcar code) 'let)
+ ((null (and (consp code) (eq (qcar code) 'let)
(progn
- (and (pairp (qcdr code))
+ (and (consp (qcdr code))
(progn
(setq lhsp (qcar (qcdr code)))
- (and (pairp (qcdr (qcdr code)))))))
+ (and (consp (qcdr (qcdr code)))))))
(atom (qcar (qcdr code)))))
(cond
- ((and (pairp code) (eq (qcar code) 'progn))
+ ((and (consp code) (eq (qcar code) 'progn))
(|stackSemanticError|
(list '|multiple assignment | item '| not allowed|)
nil))
@@ -11058,13 +11023,13 @@ Since we can't be sure we take the least disruptive course of action.
(setq |$functorLocalParameters|
(append |$functorLocalParameters| (list lhs)))))
(cond
- ((and (pairp code) (eq (qcar code) 'let)
+ ((and (consp code) (eq (qcar code) 'let)
(progn
(setq tmp2 (qcdr code))
- (and (pairp tmp2)
+ (and (consp tmp2)
(progn
(setq tmp6 (qcdr tmp2))
- (and (pairp tmp6)
+ (and (consp tmp6)
(progn
(setq rhsp (qcar tmp6))
t)))))
@@ -11086,34 +11051,34 @@ Since we can't be sure we take the least disruptive course of action.
(sublis |$LocalDomainAlist| (elt (|get| lhs '|value| |$e|) 0)))
|$LocalDomainAlist|))))
(cond
- ((and (pairp code) (eq (qcar code) 'let))
+ ((and (consp code) (eq (qcar code) 'let))
(rplaca item (if |$QuickCode| 'qsetrefv 'setelt))
(setq rhsCode rhsp)
(rplacd item (list '$ (|NRTgetLocalIndexClear| lhs) rhsCode)))
(t
(rplaca item (car code))
(rplacd item (cdr code)))))))
- ((and (pairp item) (eq (qcar item) '|:|) (pairp (qcdr item))
- (pairp (qcdr (qcdr item))) (eq (qcdr (qcdr (qcdr item))) nil))
+ ((and (consp item) (eq (qcar item) '|:|) (consp (qcdr item))
+ (consp (qcdr (qcdr item))) (eq (qcdr (qcdr (qcdr item))) nil))
(setq tmp1 (|compOrCroak| item |$EmptyMode| |$e|))
(setq |$e| (caddr tmp1))
tmp1)
- ((and (pairp item) (eq (qcar item) '|import|))
+ ((and (consp item) (eq (qcar item) '|import|))
(loop for dom in (qcdr item)
do (|sayBrightly| (cons " importing " (|formatUnabbreviated| dom))))
(setq tmp1 (|compOrCroak| item |$EmptyMode| |$e|))
(setq |$e| (caddr tmp1))
(rplaca item 'progn)
(rplacd item nil))
- ((and (pairp item) (eq (qcar item) 'if))
+ ((and (consp item) (eq (qcar item) 'if))
(|doItIf| item |$predl| |$e|))
- ((and (pairp item) (eq (qcar item) '|where|) (pairp (qcdr item)))
+ ((and (consp item) (eq (qcar item) '|where|) (consp (qcdr item)))
(|compOrCroak| item |$EmptyMode| |$e|))
- ((and (pairp item) (eq (qcar item) 'mdef))
+ ((and (consp item) (eq (qcar item) 'mdef))
(setq tmp1 (|compOrCroak| item |$EmptyMode| |$e|))
(setq |$e| (caddr tmp1)) tmp1)
- ((and (pairp item) (eq (qcar item) 'def) (pairp (qcdr item))
- (pairp (qcar (qcdr item))))
+ ((and (consp item) (eq (qcar item) 'def) (consp (qcdr item))
+ (consp (qcar (qcdr item))))
(setq op (qcar (qcar (qcdr item))))
(cond
((setq body (|isMacro| item |$e|))
@@ -11173,7 +11138,7 @@ Since we can't be sure we take the least disruptive course of action.
(loop for v in |$getDomainCode|
do
(setq result (or result
- (and (pairp v) (pairp (qcdr v))
+ (and (consp v) (consp (qcdr v))
(equal (qcar (qcdr v)) u)))))
result))
; Now we have to add code to compile all the elements of
@@ -11211,7 +11176,6 @@ Since we can't be sure we take the least disruptive course of action.
\end{chunk}
\defun{isMacro}{isMacro}
-\calls{isMacro}{pairp}
\calls{isMacro}{qcar}
\calls{isMacro}{qcdr}
\calls{isMacro}{get}
@@ -11219,10 +11183,10 @@ Since we can't be sure we take the least disruptive course of action.
(defun |isMacro| (x env)
(let (op args signature body)
(when
- (and (pairp x) (eq (qcar x) 'def) (pairp (qcdr x))
- (pairp (qcar (qcdr x))) (pairp (qcdr (qcdr x)))
- (pairp (qcdr (qcdr (qcdr x))))
- (pairp (qcdr (qcdr (qcdr (qcdr x)))))
+ (and (consp x) (eq (qcar x) 'def) (consp (qcdr x))
+ (consp (qcar (qcdr x))) (consp (qcdr (qcdr x)))
+ (consp (qcdr (qcdr (qcdr x))))
+ (consp (qcdr (qcdr (qcdr (qcdr x)))))
(eq (qcdr (qcdr (qcdr (qcdr (qcdr x))))) nil))
(setq op (qcar (qcar (qcdr x))))
(setq args (qcdr (qcar (qcdr x))))
@@ -11232,7 +11196,7 @@ Since we can't be sure we take the least disruptive course of action.
(and (null (|get| op '|modemap| env))
(null args)
(null (|get| op '|mode| env))
- (pairp signature)
+ (consp signature)
(eq (qcdr signature) nil)
(null (qcar signature)))
body))))
@@ -11288,8 +11252,8 @@ An angry JHD - August 15th., 1984
(dolist (modemap (|getModemapList| '|case| 2 ep) (nreverse0 tmp5))
(setq map (first modemap))
(when
- (and (pairp map) (pairp (qcdr map)) (pairp (qcdr (qcdr map)))
- (pairp (qcdr (qcdr (qcdr map))))
+ (and (consp map) (consp (qcdr map)) (consp (qcdr (qcdr map)))
+ (consp (qcdr (qcdr (qcdr map))))
(eq (qcdr (qcdr (qcdr (qcdr map)))) nil)
(|modeEqual| (fourth map) mode)
(|modeEqual| (third map) mp))
@@ -11374,9 +11338,9 @@ An angry JHD - August 15th., 1984
((and
(equal (setq mode (|resolve| mode (list '|Category|)))
(list '|Category|))
- (pairp form)
+ (consp form)
(eq (qcar form) 'category)
- (pairp (qcdr form)))
+ (consp (qcdr form)))
(setq domainOrPackage (second form))
(setq z (qcdr (qcdr form)))
(setq |$sigList| nil)
@@ -11391,7 +11355,6 @@ An angry JHD - August 15th., 1984
\end{chunk}
\defun{compCategoryItem}{compCategoryItem}
-\calls{compCategoryItem}{pairp}
\calls{compCategoryItem}{qcar}
\calls{compCategoryItem}{qcdr}
\calls{compCategoryItem}{compCategoryItem}
@@ -11405,21 +11368,21 @@ An angry JHD - August 15th., 1984
(cond
((null x) nil)
; 1. if x is a conditional expression, recurse; otherwise, form the predicate
- ((and (pairp x) (eq (qcar x) 'cond)
- (pairp (qcdr x)) (eq (qcdr (qcdr x)) nil)
- (pairp (qcar (qcdr x)))
- (pairp (qcdr (qcar (qcdr x))))
+ ((and (consp x) (eq (qcar x) 'cond)
+ (consp (qcdr x)) (eq (qcdr (qcdr x)) nil)
+ (consp (qcar (qcdr x)))
+ (consp (qcdr (qcar (qcdr x))))
(eq (qcdr (qcdr (qcar (qcdr x)))) nil))
(setq p (qcar (qcar (qcdr x))))
(setq e (qcar (qcdr (qcar (qcdr x)))))
(setq predlp (cons p predl))
(cond
- ((and (pairp e) (eq (qcar e) 'progn))
+ ((and (consp e) (eq (qcar e) 'progn))
(setq z (qcdr e))
(dolist (y z) (|compCategoryItem| y predlp)))
(t (|compCategoryItem| e predlp))))
- ((and (pairp x) (eq (qcar x) 'if) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (pairp (qcdr (qcdr (qcdr x))))
+ ((and (consp x) (eq (qcar x) 'if) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (consp (qcdr (qcdr (qcdr x))))
(eq (qcdr (qcdr (qcdr (qcdr x)))) nil))
(setq a (qcar (qcdr x)))
(setq b (qcar (qcdr (qcdr x))))
@@ -11427,7 +11390,7 @@ An angry JHD - August 15th., 1984
(setq predlp (cons a predl))
(unless (eq b '|noBranch|)
(cond
- ((and (pairp b) (eq (qcar b) 'progn))
+ ((and (consp b) (eq (qcar b) 'progn))
(setq z (qcdr b))
(dolist (y z) (|compCategoryItem| y predlp)))
(t (|compCategoryItem| b predlp))))
@@ -11436,7 +11399,7 @@ An angry JHD - August 15th., 1984
(t
(setq predlp (cons (list '|not| a) predl))
(cond
- ((and (pairp c) (eq (qcar c) 'progn))
+ ((and (consp c) (eq (qcar c) 'progn))
(setq z (qcdr c))
(dolist (y z) (|compCategoryItem| y predlp)))
(t (|compCategoryItem| c predlp))))))
@@ -11444,12 +11407,12 @@ An angry JHD - August 15th., 1984
(setq pred (if predl (mkpf predl 'and) t))
(cond
; 2. if attribute, push it and return
- ((and (pairp x) (eq (qcar x) 'attribute)
- (pairp (qcdr x)) (eq (qcdr (qcdr x)) nil))
+ ((and (consp x) (eq (qcar x) 'attribute)
+ (consp (qcdr x)) (eq (qcdr (qcdr x)) nil))
(setq y (qcar (qcdr x)))
(push (mkq (list y pred)) |$atList|))
; 3. it may be a list, with PROGN as the CAR, and some information as the CDR
- ((and (pairp x) (eq (qcar x) 'progn))
+ ((and (consp x) (eq (qcar x) 'progn))
(setq z (qcdr x))
(dolist (u z) (|compCategoryItem| u predl)))
(t
@@ -11512,14 +11475,13 @@ An angry JHD - August 15th., 1984
\end{chunk}
\defun{mustInstantiate}{mustInstantiate}
-\calls{mustInstantiate}{pairp}
\calls{mustInstantiate}{qcar}
\calls{mustInstantiate}{getl}
\refsdollar{mustInstantiate}{DummyFunctorNames}
\begin{chunk}{defun mustInstantiate}
(defun |mustInstantiate| (d)
(declare (special |$DummyFunctorNames|))
- (and (pairp d)
+ (and (consp d)
(null (or (member (qcar d) |$DummyFunctorNames|)
(getl (qcar d) '|makeFunctionList|)))))
@@ -11590,10 +11552,10 @@ An angry JHD - August 15th., 1984
argt)
((or (|isDomainForm| argt env) (|isCategoryForm| argt env))
argt)
- ((and (pairp argt) (eq (qcar argt) '|Mapping|)
+ ((and (consp argt) (eq (qcar argt) '|Mapping|)
(progn
(setq tmp2 (qcdr argt))
- (and (pairp tmp2)
+ (and (consp tmp2)
(progn
(setq mprime (qcar tmp2))
(setq r (qcdr tmp2))
@@ -11610,26 +11572,26 @@ An angry JHD - August 15th., 1984
(t
(setq env
(cond
- ((and (pairp argf)
+ ((and (consp argf)
(progn
(setq op (qcar argf))
(setq argl (qcdr argf))
t)
- (null (and (pairp argt) (eq (qcar argt) '|Mapping|))))
+ (null (and (consp argt) (eq (qcar argt) '|Mapping|))))
(setq newTarget
(eqsubstlist (take (|#| argl) |$FormalMapVariableList|)
(dolist (x argl (nreverse0 g2))
(setq g2
(cons
(cond
- ((and (pairp x) (eq (qcar x) '|:|)
+ ((and (consp x) (eq (qcar x) '|:|)
(progn
(setq tmp2 (qcdr x))
- (and (pairp tmp2)
+ (and (consp tmp2)
(progn
(setq a (qcar tmp2))
(setq tmp3 (qcdr tmp2))
- (and (pairp tmp3)
+ (and (consp tmp3)
(eq (qcdr tmp3) nil)
(progn
(setq mode (qcar tmp3))
@@ -11645,14 +11607,14 @@ An angry JHD - August 15th., 1984
(setq g5
(cons
(cond
- ((and (pairp x) (eq (qcar x) '|:|)
+ ((and (consp x) (eq (qcar x) '|:|)
(progn
(setq tmp2 (qcdr x))
- (and (pairp tmp2)
+ (and (consp tmp2)
(progn
(setq a (qcar tmp2))
(setq tmp3 (qcdr tmp2))
- (and (pairp tmp3)
+ (and (consp tmp3)
(eq (qcdr tmp3) nil)
(progn
(setq mode (qcar tmp3))
@@ -11668,11 +11630,11 @@ An angry JHD - August 15th., 1984
((and (null |$bootStrapMode|) |$insideFunctorIfTrue|
(progn
(setq tmp2 (|makeCategoryForm| argt env))
- (and (pairp tmp2)
+ (and (consp tmp2)
(progn
(setq catform (qcar tmp2))
(setq tmp3 (qcdr tmp2))
- (and (pairp tmp3)
+ (and (consp tmp3)
(eq (qcdr tmp3) nil)
(progn
(setq env (qcar tmp3))
@@ -11717,7 +11679,6 @@ An angry JHD - August 15th., 1984
\defun{compCons1}{compCons1}
\calls{compCons1}{comp}
\calls{compCons1}{convert}
-\calls{compCons1}{pairp}
\calls{compCons1}{qcar}
\calls{compCons1}{qcdr}
\usesdollar{compCons1}{EmptyMode}
@@ -11741,7 +11702,7 @@ An angry JHD - August 15th., 1984
(setq env (third yt))
(setq td
(cond
- ((and (pairp my) (eq (qcar my) '|List|) (pairp (qcdr my)))
+ ((and (consp my) (eq (qcar my) '|List|) (consp (qcdr my)))
(setq mp (second my))
(when (setq mr (list '|List| (|resolve| mp mx)))
(when (setq ytp (|convert| yt mr))
@@ -11749,7 +11710,7 @@ An angry JHD - August 15th., 1984
(setq x (first tmp1))
(setq env (third tmp1))
(cond
- ((and (pairp (car ytp)) (eq (qcar (car ytp)) 'list))
+ ((and (consp (car ytp)) (eq (qcar (car ytp)) 'list))
(list (cons 'list (cons x (cdr (car ytp)))) mr env))
(t
(list (list 'cons x (car ytp)) mr env)))))))
@@ -12026,7 +11987,6 @@ An angry JHD - August 15th., 1984
\defun{getSignatureFromMode}{getSignatureFromMode}
\calls{getSignatureFromMode}{getmode}
\calls{getSignatureFromMode}{opOf}
-\calls{getSignatureFromMode}{pairp}
\calls{getSignatureFromMode}{qcar}
\calls{getSignatureFromMode}{qcdr}
\calls{getSignatureFromMode}{nequal}
@@ -12040,7 +12000,7 @@ An angry JHD - August 15th., 1984
(let (tmp1 signature)
(declare (special |$FormalMapVariableList|))
(setq tmp1 (|getmode| (|opOf| form) env))
- (when (and (pairp tmp1) (eq (qcar tmp1) '|Mapping|))
+ (when (and (consp tmp1) (eq (qcar tmp1) '|Mapping|))
(setq signature (qcdr tmp1))
(if (nequal (|#| form) (|#| signature))
(|stackAndThrow| (list '|Wrong number of arguments: | form))
@@ -12210,7 +12170,7 @@ An angry JHD - August 15th., 1984
((and (null (|member| |$op| |$formalArgList|))
(progn
(setq tmp2 (|getmode| |$op| e))
- (and (pairp tmp2) (eq (qcar tmp2) '|Mapping|))))
+ (and (consp tmp2) (eq (qcar tmp2) '|Mapping|))))
'|local|)
(t '|exported|)))
; 6a skip if compiling only certain items but not this one
@@ -12249,7 +12209,6 @@ An angry JHD - August 15th., 1984
\defun{compileCases}{compileCases}
\calls{compileCases}{eval}
-\calls{compileCases}{pairp}
\calls{compileCases}{qcar}
\calls{compileCases}{qcdr}
\calls{compileCases}{msubst}
@@ -12270,12 +12229,12 @@ An angry JHD - August 15th., 1984
(isEltArgumentIn (Rlist x)
(cond
((atom x) nil)
- ((and (pairp x) (eq (qcar x) 'elt) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ ((and (consp x) (eq (qcar x) 'elt) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(or (member (second x) Rlist)
(isEltArgumentIn Rlist (cdr x))))
- ((and (pairp x) (eq (qcar x) 'qrefelt) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ ((and (consp x) (eq (qcar x) 'qrefelt) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(or (member (second x) Rlist)
(isEltArgumentIn Rlist (cdr x))))
(t
@@ -12339,7 +12298,6 @@ An angry JHD - August 15th., 1984
\end{chunk}
\defun{addArgumentConditions}{addArgumentConditions}
-\calls{addArgumentConditions}{pairp}
\calls{addArgumentConditions}{qcar}
\calls{addArgumentConditions}{qcdr}
\calls{addArgumentConditions}{mkq}
@@ -12356,8 +12314,8 @@ An angry JHD - August 15th., 1984
(fn (clist)
(let (n untypedCondition typedCondition)
(cond
- ((and (pairp clist) (pairp (qcar clist)) (pairp (qcdr (qcar clist)))
- (pairp (qcdr (qcdr (qcar clist))))
+ ((and (consp clist) (consp (qcar clist)) (consp (qcdr (qcar clist)))
+ (consp (qcdr (qcdr (qcar clist))))
(eq (qcdr (qcdr (qcdr (qcar clist)))) nil))
(setq n (qcar (qcar clist)))
(setq untypedCondition (qcar (qcdr (qcar clist))))
@@ -12402,7 +12360,6 @@ An angry JHD - August 15th., 1984
\end{chunk}
\defun{stripOffSubdomainConditions}{stripOffSubdomainConditions}
-\calls{stripOffSubdomainConditions}{pairp}
\calls{stripOffSubdomainConditions}{qcar}
\calls{stripOffSubdomainConditions}{qcdr}
\calls{stripOffSubdomainConditions}{assoc}
@@ -12417,8 +12374,8 @@ An angry JHD - August 15th., 1984
do (incf i)
collect
(cond
- ((and (pairp x) (eq (qcar x) '|SubDomain|) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ ((and (consp x) (eq (qcar x) '|SubDomain|) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(cond
((setq pair (|assoc| i |$argumentConditionList|))
(rplac (cadr pair) (mkpf (list (third x) (cadr pair)) 'and))
@@ -12432,7 +12389,6 @@ An angry JHD - August 15th., 1984
\end{chunk}
\defun{stripOffArgumentConditions}{stripOffArgumentConditions}
-\calls{stripOffArgumentConditions}{pairp}
\calls{stripOffArgumentConditions}{qcar}
\calls{stripOffArgumentConditions}{qcdr}
\calls{stripOffArgumentConditions}{msubst}
@@ -12446,8 +12402,8 @@ An angry JHD - August 15th., 1984
do (incf i)
collect
(cond
- ((and (pairp x) (eq (qcar x) '|\||) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ ((and (consp x) (eq (qcar x) '|\||) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(setq condition (msubst '|#1| (second x) (third x)))
(setq |$argumentConditionList|
(cons (list i (second x) condition) |$argumentConditionList|))
@@ -12465,7 +12421,6 @@ is still more than one complain else return the only signature.
\calls{getSignature}{remdup}
\calls{getSignature}{knownInfo}
\calls{getSignature}{getmode}
-\calls{getSignature}{pairp}
\calls{getSignature}{qcar}
\calls{getSignature}{qcdr}
\calls{getSignature}{say}
@@ -12493,7 +12448,7 @@ is still more than one complain else return the only signature.
(cond
((progn
(setq tmp1 (setq u (|getmode| op |$e|)))
- (and (pairp tmp1) (eq (qcar tmp1) '|Mapping|)))
+ (and (consp tmp1) (eq (qcar tmp1) '|Mapping|)))
(qcdr tmp1))
(t
(say "************* USER ERROR **********")
@@ -12636,8 +12591,8 @@ is still more than one complain else return the only signature.
(setq anOp (third form))
(setq aDomain (second form))
(cond
- ((null (and (pairp form) (eq (qcar form) '|elt|)
- (pairp (qcdr form)) (pairp (qcdr (qcdr form)))
+ ((null (and (consp form) (eq (qcar form) '|elt|)
+ (consp (qcdr form)) (consp (qcdr (qcdr form)))
(eq (qcdr (qcdr (qcdr form))) nil)))
(|compForm| form mode env))
((eq aDomain '|Lisp|)
@@ -12669,7 +12624,7 @@ is still more than one complain else return the only signature.
(setq pred (caadr modemap))
(setq val (cadadr modemap))
(unless (and (nequal (|#| sig) 2)
- (null (and (pairp val) (eq (qcar val) '|elt|))))
+ (null (and (consp val) (eq (qcar val) '|elt|))))
(setq val (|genDeltaEntry| (cons (|opOf| anOp) modemap)))
(|convert| (list (list '|call| val) (second sig) env) mode))))
(t
@@ -12742,7 +12697,6 @@ is still more than one complain else return the only signature.
\calls{compHasFormat}{length}
\calls{compHasFormat}{sublislis}
\calls{compHasFormat}{comp}
-\calls{compHasFormat}{pairp}
\calls{compHasFormat}{qcar}
\calls{compHasFormat}{qcdr}
\calls{compHasFormat}{mkList}
@@ -12769,11 +12723,11 @@ is still more than one complain else return the only signature.
(setq a (car tmp1))
(setq a (sublislis formals argl a))
(cond
- ((and (pairp b) (eq (qcar b) 'attribute) (pairp (qcdr b))
+ ((and (consp b) (eq (qcar b) 'attribute) (consp (qcdr b))
(eq (qcdr (qcdr b)) nil))
(list '|HasAttribute| a (list 'quote (qcar (qcdr b)))))
- ((and (pairp b) (eq (qcar b) 'signature) (pairp (qcdr b))
- (pairp (qcdr (qcdr b))) (EQ (QCDR (qcdr (qcdr b))) NIL))
+ ((and (consp b) (eq (qcar b) 'signature) (consp (qcdr b))
+ (consp (qcdr (qcdr b))) (EQ (QCDR (qcdr (qcdr b))) NIL))
(list '|HasSignature| a
(|mkList|
(list (MKQ (qcar (qcdr b)))
@@ -12856,7 +12810,6 @@ is still more than one complain else return the only signature.
\defun{canReturn}{canReturn}
\calls{canReturn}{say}
-\calls{canReturn}{pairp}
\calls{canReturn}{qcar}
\calls{canReturn}{qcdr}
\calls{canReturn}{canReturn}
@@ -12867,11 +12820,11 @@ is still more than one complain else return the only signature.
(findThrow (gs expr level exitCount ValueFlag)
(cond
((atom expr) nil)
- ((and (pairp expr) (eq (qcar expr) 'throw) (pairp (qcdr expr))
- (equal (qcar (qcdr expr)) gs) (pairp (qcdr (qcdr expr)))
+ ((and (consp expr) (eq (qcar expr) 'throw) (consp (qcdr expr))
+ (equal (qcar (qcdr expr)) gs) (consp (qcdr (qcdr expr)))
(eq (qcdr (qcdr (qcdr expr))) nil))
t)
- ((and (pairp expr) (eq (qcar expr) 'seq))
+ ((and (consp expr) (eq (qcar expr) 'seq))
(let (result)
(loop for u in (qcdr expr)
do (setq result
@@ -12891,7 +12844,7 @@ is still more than one complain else return the only signature.
((eq (setq op (car expr)) 'quote) (and ValueFlag (equal level exitCount)))
((eq op '|TAGGEDexit|)
(cond
- ((and (pairp expr) (pairp (qcdr expr)) (pairp (qcdr (qcdr expr)))
+ ((and (consp expr) (consp (qcdr expr)) (consp (qcdr (qcdr expr)))
(eq (qcdr (qcdr (qcdr expr))) nil))
(|canReturn| (car (third expr)) level (second expr)
(equal (second expr) level)))))
@@ -12930,8 +12883,8 @@ is still more than one complain else return the only signature.
inner))))
outer))))
((eq op 'if)
- (and (pairp expr) (pairp (qcdr expr)) (pairp (qcdr (qcdr expr)))
- (pairp (qcdr (qcdr (qcdr expr))))
+ (and (consp expr) (consp (qcdr expr)) (consp (qcdr (qcdr expr)))
+ (consp (qcdr (qcdr (qcdr expr))))
(eq (qcdr (qcdr (qcdr (qcdr expr)))) nil))
(cond
((null (|canReturn| (second expr) 0 0 t))
@@ -12946,8 +12899,8 @@ is still more than one complain else return the only signature.
do (setq result
(and result (|canReturn| u level exitCount ValueFlag))))
result))
- ((and (pairp op) (eq (qcar op) 'xlam) (pairp (qcdr op))
- (pairp (qcdr (qcdr op))) (eq (qcdr (qcdr (qcdr op))) nil))
+ ((and (consp op) (eq (qcar op) 'xlam) (consp (qcdr op))
+ (consp (qcdr (qcdr op))) (eq (qcdr (qcdr (qcdr op))) nil))
(let ((result t))
(loop for u in expr
do (setq result
@@ -12974,7 +12927,6 @@ is still more than one complain else return the only signature.
\end{chunk}
\defun{getSuccessEnvironment}{getSuccessEnvironment}
-\calls{getSuccessEnvironment}{pairp}
\calls{getSuccessEnvironment}{qcar}
\calls{getSuccessEnvironment}{qcdr}
\calls{getSuccessEnvironment}{isDomainForm}
@@ -12993,14 +12945,14 @@ is still more than one complain else return the only signature.
(let (id currentProplist tt newProplist x m)
(declare (special |$EmptyMode| |$EmptyEnvironment|))
(cond
- ((and (pairp a) (eq (qcar a) '|has|) (PAIRP (qcdr a))
- (pairp (qcdr (qcdr a))) (eq (qcdr (qcdr (qcdr a))) nil))
+ ((and (consp a) (eq (qcar a) '|has|) (CONSP (qcdr a))
+ (consp (qcdr (qcdr a))) (eq (qcdr (qcdr (qcdr a))) nil))
(if
(and (identp (second a)) (|isDomainForm| (third a) |$EmptyEnvironment|))
(|put| (second a) '|specialCase| (third a) env)
env))
- ((and (pairp a) (eq (qcar a) '|is|) (pairp (qcdr a))
- (pairp (qcdr (qcdr a))) (eq (qcdr (qcdr (qcdr a))) nil))
+ ((and (consp a) (eq (qcar a) '|is|) (consp (qcdr a))
+ (consp (qcdr (qcdr a))) (eq (qcdr (qcdr (qcdr a))) nil))
(setq id (qcar (qcdr a)))
(setq m (qcar (qcdr (qcdr a))))
(cond
@@ -13015,8 +12967,8 @@ is still more than one complain else return the only signature.
(cons m (cdr (|removeEnv| tt)))))
(|addBinding| id newProplist env)))
(t env)))
- ((and (pairp a) (eq (qcar a) '|case|) (pairp (qcdr a))
- (pairp (qcdr (qcdr a))) (eq (qcdr (qcdr (qcdr a))) nil)
+ ((and (consp a) (eq (qcar a) '|case|) (consp (qcdr a))
+ (consp (qcdr (qcdr a))) (eq (qcdr (qcdr (qcdr a))) nil)
(identp (qcar (qcdr a))))
(setq x (qcar (qcdr a)))
(setq m (qcar (qcdr (qcdr a))))
@@ -13026,7 +12978,6 @@ is still more than one complain else return the only signature.
\end{chunk}
\defun{getInverseEnvironment}{getInverseEnvironment}
-\calls{getInverseEnvironment}{pairp}
\calls{getInverseEnvironment}{qcar}
\calls{getInverseEnvironment}{qcdr}
\calls{getInverseEnvironment}{identp}
@@ -13055,14 +13006,14 @@ is still more than one complain else return the only signature.
((and (identp x) (|isDomainForm| m |$EmptyEnvironment|))
(|put| x '|specialCase| m env))
(t env)))
- ((and (pairp a) (eq (qcar a) '|case|) (pairp (qcdr a))
- (pairp (qcdr (qcdr a))) (eq (qcdr (qcdr (qcdr a))) nil)
+ ((and (consp a) (eq (qcar a) '|case|) (consp (qcdr a))
+ (consp (qcdr (qcdr a))) (eq (qcdr (qcdr (qcdr a))) nil)
(identp (qcar (qcdr a))))
(setq x (qcar (qcdr a)))
(setq m (qcar (qcdr (qcdr a))))
(setq tmp1 (|get| x '|condition| env))
(cond
- ((and tmp1 (pairp tmp1) (eq (qcdr tmp1) nil) (pairp (qcar tmp1))
+ ((and tmp1 (consp tmp1) (eq (qcdr tmp1) nil) (consp (qcar tmp1))
(eq (qcar (qcar tmp1)) 'or) (|member| a (qcdr (qcar tmp1))))
(setq oldpred (qcdr (qcar tmp1)))
(|put| x '|condition| (list (mkpf (|delete| a oldpred) 'or)) env))
@@ -13070,8 +13021,8 @@ is still more than one complain else return the only signature.
(setq tmp1 (|getUnionMode| x env))
(setq zz (|delete| m (qcdr tmp1)))
(loop for u in zz
- when (and (pairp u) (eq (qcar u) '|:|)
- (pairp (qcdr u)) (equal (qcar (qcdr u)) m))
+ when (and (consp u) (eq (qcar u) '|:|)
+ (consp (qcdr u)) (equal (qcar (qcdr u)) m))
do (setq zz (|delete| u zz)))
(setq newpred
(mkpf (loop for mp in zz collect (list '|case| x mp)) 'or))
@@ -13099,16 +13050,16 @@ is still more than one complain else return the only signature.
(defun |isUnionMode| (m env)
(let (mp v tmp1)
(cond
- ((and (pairp m) (eq (qcar m) '|Union|)) m)
+ ((and (consp m) (eq (qcar m) '|Union|)) m)
((progn
(setq tmp1 (setq mp (|getmode| m env)))
- (and (pairp tmp1) (eq (qcar tmp1) '|Mapping|)
- (pairp (qcdr tmp1)) (eq (qcdr (qcdr tmp1)) nil)
- (pairp (qcar (qcdr tmp1)))
+ (and (consp tmp1) (eq (qcar tmp1) '|Mapping|)
+ (consp (qcdr tmp1)) (eq (qcdr (qcdr tmp1)) nil)
+ (consp (qcar (qcdr tmp1)))
(eq (qcar (qcar (qcdr tmp1))) '|UnionCategory|)))
(second mp))
((setq v (|get| (if (eq m '$) '|Rep| m) '|value| env))
- (when (and (pairp (car v)) (eq (qcar (car v)) '|Union|)) (car v))))))
+ (when (and (consp (car v)) (eq (qcar (car v)) '|Union|)) (car v))))))
\end{chunk}
@@ -13177,7 +13128,6 @@ is still more than one complain else return the only signature.
\calls{compJoin}{isCategoryForm}
\calls{compJoin}{union}
\calls{compJoin}{compJoin,getParms}
-\calls{compJoin}{pairp}
\calls{compJoin}{qcar}
\calls{compJoin}{qcdr}
\calls{compJoin}{wrapDomainSub}
@@ -13190,8 +13140,8 @@ is still more than one complain else return the only signature.
(cond
((atom y)
(when (|isDomainForm| y env) (list y)))
- ((and (pairp y) (eq (qcar y) 'length)
- (pairp (qcdr y)) (eq (qcdr (qcdr y)) nil))
+ ((and (consp y) (eq (qcar y) 'length)
+ (consp (qcdr y)) (eq (qcdr (qcdr y)) nil))
(list y (second y)))
(t (list y)))) )
(let (argl catList pl tmp3 tmp4 tmp5 body parameters catListp td)
@@ -13217,13 +13167,13 @@ is still more than one complain else return the only signature.
(setq tmp5 (append tmp5 (getParms y env))))
parameters))
x)
- ((and (pairp x) (eq (qcar x) '|DomainSubstitutionMacro|)
- (pairp (qcdr x)) (pairp (qcdr (qcdr x)))
+ ((and (consp x) (eq (qcar x) '|DomainSubstitutionMacro|)
+ (consp (qcdr x)) (consp (qcdr (qcdr x)))
(eq (qcdr (qcdr (qcdr x))) nil))
(setq pl (second x))
(setq body (third x))
(setq parameters (|union| pl parameters)) body)
- ((and (pairp x) (eq (qcar x) '|mkCategory|))
+ ((and (consp x) (eq (qcar x) '|mkCategory|))
x)
((and (atom x) (equal (|getmode| x env) |$Category|))
x)
@@ -13268,19 +13218,19 @@ is still more than one complain else return the only signature.
(setq vl (second form))
(setq body (third form))
(cond
- ((and (pairp vl) (eq (qcar vl) '|:|)
+ ((and (consp vl) (eq (qcar vl) '|:|)
(progn
(setq tmp1 (qcdr vl))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq args (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn
(setq target (qcar tmp2))
t))))))
- (when (and (pairp args) (eq (qcar args) '|@Tuple|))
+ (when (and (consp args) (eq (qcar args) '|@Tuple|))
(setq args (qcdr args)))
(cond
((listp args)
@@ -13354,13 +13304,13 @@ is still more than one complain else return the only signature.
(setq rhs (fifth form))
(setq prhs
(cond
- ((and (pairp rhs) (eq (qcar rhs) 'category))
+ ((and (consp rhs) (eq (qcar rhs) 'category))
(list "-- the constructor category"))
- ((and (pairp rhs) (eq (qcar rhs) '|Join|))
+ ((and (consp rhs) (eq (qcar rhs) '|Join|))
(list "-- the constructor category"))
- ((and (pairp rhs) (eq (qcar rhs) 'capsule))
+ ((and (consp rhs) (eq (qcar rhs) 'capsule))
(list "-- the constructor capsule"))
- ((and (pairp rhs) (eq (qcar rhs) '|add|))
+ ((and (consp rhs) (eq (qcar rhs) '|add|))
(list "-- the constructor capsule"))
(t (|formatUnabbreviated| rhs))))
(|sayBrightly|
@@ -13732,7 +13682,6 @@ is still more than one complain else return the only signature.
\end{chunk}
\defun{replaceExitEtc}{replaceExitEtc}
-\calls{replaceExitEtc}{pairp}
\calls{replaceExitEtc}{qcar}
\calls{replaceExitEtc}{qcdr}
\calls{replaceExitEtc}{rplac}
@@ -13746,9 +13695,9 @@ is still more than one complain else return the only signature.
(declare (special |$finalEnv|))
(cond
((atom x) nil)
- ((and (pairp x) (eq (qcar x) 'quote)) nil)
- ((and (pairp x) (equal (qcar x) opFlag) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ ((and (consp x) (eq (qcar x) 'quote)) nil)
+ ((and (consp x) (equal (qcar x) opFlag) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(|rplac| (caaddr x) (|replaceExitEtc| (caaddr x) tag opFlag opMode))
(cond
((eql (second x) 0)
@@ -13761,7 +13710,7 @@ is still more than one complain else return the only signature.
(|rplac| (caddr x) (car (|convertOrCroak| (caddr x) opMode))))
(t
(|rplac| (cadr x) (1- (cadr x))))))
- ((and (pairp x) (pairp (qcdr x)) (pairp (qcdr (qcdr x)))
+ ((and (consp x) (consp (qcdr x)) (consp (qcdr (qcdr x)))
(eq (qcdr (qcdr (qcdr x))) nil)
(member (qcar x) '(|TAGGEDreturn| |TAGGEDexit|)))
(|rplac| (car (caddr x))
@@ -13834,13 +13783,13 @@ is still more than one complain else return the only signature.
(declare (special |$EmptyMode|))
(cond
((identp form) (|setqSingle| form val mode env))
- ((and (pairp form) (eq (qcar form) '|:|) (pairp (qcdr form))
- (pairp (qcdr (qcdr form))) (eq (qcdr (qcdr (qcdr form))) nil))
+ ((and (consp form) (eq (qcar form) '|:|) (consp (qcdr form))
+ (consp (qcdr (qcdr form))) (eq (qcdr (qcdr (qcdr form))) nil))
(setq x (second form))
(setq y (third form))
(setq ep (third (|compMakeDeclaration| form |$EmptyMode| env)))
(|compSetq| (list 'let x val) mode ep))
- ((pairp form)
+ ((consp form)
(setq op (qcar form))
(setq z (qcdr form))
(cond
@@ -13856,15 +13805,14 @@ is still more than one complain else return the only signature.
(defun |uncons| (x)
(cond
((atom x) x)
- ((and (pairp x) (eq (qcar x) 'cons) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ ((and (consp x) (eq (qcar x) 'cons) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(cons (second x) (|uncons| (third x))))))
\end{chunk}
\defun{setqMultiple}{setqMultiple}
\calls{setqMultiple}{nreverse0}
-\calls{setqMultiple}{pairp}
\calls{setqMultiple}{qcar}
\calls{setqMultiple}{qcdr}
\calls{setqMultiple}{stackMessage}
@@ -13888,24 +13836,24 @@ is still more than one complain else return the only signature.
(let (tmp1 z)
(declare (special |$EmptyMode|))
(cond
- ((and (pairp tt) (eq (qcar tt) '|Record|)
+ ((and (consp tt) (eq (qcar tt) '|Record|)
(progn (setq z (qcdr tt)) t))
(loop for item in z
collect (cons (second item) (third item))))
((progn
(setq tmp1 (|comp| tt |$EmptyMode| env))
- (and (pairp tmp1) (PAIRP (qcdr tmp1)) (PAIRP (qcar (qcdr tmp1)))
+ (and (consp tmp1) (CONSP (qcdr tmp1)) (CONSP (qcar (qcdr tmp1)))
(eq (qcar (qcar (qcdr tmp1))) '|RecordCategory|)
- (pairp (qcdr (qcdr tmp1))) (eq (qcdr (qcdr (qcdr tmp1))) nil)))
+ (consp (qcdr (qcdr tmp1))) (eq (qcdr (qcdr (qcdr tmp1))) nil)))
(loop for item in z
collect (cons (second item) (third item))))
(t (|stackMessage| (list '|no multiple assigns to mode: | tt)))))))
(let (g m1 tt x mp selectorModePairs tmp2 assignList)
(declare (special |$noEnv| |$EmptyMode| |$NoValueMode|))
(cond
- ((and (pairp val) (eq (qcar val) 'cons) (equal m |$NoValueMode|))
+ ((and (consp val) (eq (qcar val) 'cons) (equal m |$NoValueMode|))
(|setqMultipleExplicit| nameList (|uncons| val) m env))
- ((and (pairp val) (eq (qcar val) '|@Tuple|) (equal m |$NoValueMode|))
+ ((and (consp val) (eq (qcar val) '|@Tuple|) (equal m |$NoValueMode|))
(|setqMultipleExplicit| nameList (qcdr val) m env))
; 1 create a gensym, %add to local environment, compile and assign rhs
(t
@@ -13923,7 +13871,7 @@ is still more than one complain else return the only signature.
(setq mp (second tmp2))
(setq env (third tmp2))
(cond
- ((and (pairp m1) (eq (qcar m1) '|List|) (pairp (qcdr m1))
+ ((and (consp m1) (eq (qcar m1) '|List|) (consp (qcdr m1))
(eq (qcdr (qcdr m1)) nil))
(loop for y in nameList do
(setq env
@@ -14081,7 +14029,7 @@ is still more than one complain else return the only signature.
(setq newProplist
(|consProplistOf| form currentProplist '|value|
(|removeEnv| (cons val (cdr td)))))
- (setq ep (if (pairp form) ep (|addBinding| form newProplist ep)))
+ (setq ep (if (consp form) ep (|addBinding| form newProplist ep)))
(when (|isDomainForm| val ep)
(when (|isDomainInScope| form ep)
(|stackWarning|
@@ -14119,7 +14067,6 @@ is still more than one complain else return the only signature.
\defun{outputComp}{outputComp}
\calls{outputComp}{comp}
-\calls{outputComp}{pairp}
\calls{outputComp}{qcar}
\calls{outputComp}{qcdr}
\calls{outputComp}{nreverse0}
@@ -14132,7 +14079,7 @@ is still more than one complain else return the only signature.
(declare (special |$Expression|))
(cond
((|comp| (list '|::| x |$Expression|) |$Expression| env))
- ((and (pairp x) (eq (qcar x) '|construct|))
+ ((and (consp x) (eq (qcar x) '|construct|))
(setq argl (qcdr x))
(list (cons 'list
(let (result tmp1)
@@ -14147,7 +14094,7 @@ is still more than one complain else return the only signature.
(nreverse0 result)))
|$Expression| env))
((and (setq v (|get| x '|value| env))
- (pairp (cadr v)) (eq (qcar (cadr v)) '|Union|))
+ (consp (cadr v)) (eq (qcar (cadr v)) '|Union|))
(list (list '|coerceUn2E| x (cadr v)) |$Expression| env))
(t (list x |$Expression| env)))))
@@ -14167,7 +14114,6 @@ is still more than one complain else return the only signature.
\defun{isDomainForm}{isDomainForm}
\calls{isDomainForm}{kar}
-\calls{isDomainForm}{pairp}
\calls{isDomainForm}{qcar}
\calls{isDomainForm}{qcdr}
\calls{isDomainForm}{isFunctor}
@@ -14181,7 +14127,7 @@ is still more than one complain else return the only signature.
(or (member (kar d) |$SpecialDomainNames|) (|isFunctor| d)
(and (progn
(setq tmp1 (|getmode| d env))
- (and (pairp tmp1) (eq (qcar tmp1) '|Mapping|) (pairp (qcdr tmp1))))
+ (and (consp tmp1) (eq (qcar tmp1) '|Mapping|) (consp (qcdr tmp1))))
(|isCategoryForm| (qcar (qcdr tmp1)) env))
(|isCategoryForm| (|getmode| d env) env)
(|isDomainConstructorForm| d env))))
@@ -14189,7 +14135,6 @@ is still more than one complain else return the only signature.
\end{chunk}
\defun{isDomainConstructorForm}{isDomainConstructorForm}
-\calls{isDomainConstructorForm}{pairp}
\calls{isDomainConstructorForm}{qcar}
\calls{isDomainConstructorForm}{qcdr}
\calls{isDomainConstructorForm}{isCategoryForm}
@@ -14200,13 +14145,13 @@ is still more than one complain else return the only signature.
(let (u)
(declare (special |$FormalMapVariableList|))
(when
- (and (pairp d)
+ (and (consp d)
(setq u (|get| (qcar d) '|value| env))
- (pairp u)
- (pairp (qcdr u))
- (pairp (qcar (qcdr u)))
+ (consp u)
+ (consp (qcdr u))
+ (consp (qcar (qcdr u)))
(eq (qcar (qcar (qcdr u))) '|Mapping|)
- (pairp (qcdr (qcar (qcdr u)))))
+ (consp (qcdr (qcar (qcdr u)))))
(|isCategoryForm|
(eqsubstlist (rest d) |$FormalMapVariableList| (cadadr u)) env))))
@@ -14536,8 +14481,8 @@ of basic objects may not be the same.
(cond
((or (|isSubset| m mp env) (and (eq m '|Rep|) (eq mp '$)))
(list x mp env))
- ((and (pairp m) (eq (qcar m) '|SubDomain|)
- (pairp (qcdr m)) (equal (qcar (qcdr m)) mp))
+ ((and (consp m) (eq (qcar m) '|SubDomain|)
+ (consp (qcdr m)) (equal (qcar (qcdr m)) mp))
(list x mp env))
((and (setq pred (lassoc (|opOf| mp) (|get| (|opOf| m) '|SubDomain| env)))
(integerp x) (|eval| (msubst x '|#1| pred)))
@@ -14572,25 +14517,25 @@ of basic objects may not be the same.
((or (|modeEqual| mp m)
(and (or (progn
(setq tmp1 (|get| mp '|value| |$e|))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn (setq mpp (qcar tmp1)) t)))
(progn
(setq tmp1 (|getmode| mp |$e|))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcar tmp1) '|Mapping|)
- (and (pairp (qcdr tmp1))
+ (and (consp (qcdr tmp1))
(eq (qcdr (qcdr tmp1)) nil)
(progn (setq mpp (qcar (qcdr tmp1))) t)))))
(|modeEqual| mpp m))
(and (or (progn
(setq tmp1 (|get| m '|value| |$e|))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn (setq mpp (qcar tmp1)) t)))
(progn
(setq tmp1 (|getmode| m |$e|))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcar tmp1) '|Mapping|)
- (and (pairp (qcdr tmp1))
+ (and (consp (qcdr tmp1))
(eq (qcdr (qcdr tmp1)) nil)
(progn (setq mpp (qcar (qcdr tmp1))) t)))))
(|modeEqual| mpp mp)))
@@ -14611,7 +14556,6 @@ of basic objects may not be the same.
\defun{coerceExtraHard}{coerceExtraHard}
\calls{coerceExtraHard}{autoCoerceByModemap}
\calls{coerceExtraHard}{isUnionMode}
-\calls{coerceExtraHard}{pairp}
\calls{coerceExtraHard}{qcar}
\calls{coerceExtraHard}{qcdr}
\calls{coerceExtraHard}{hasType}
@@ -14630,7 +14574,7 @@ of basic objects may not be the same.
((setq tp (|autoCoerceByModemap| tt m)) tp)
((and (progn
(setq tmp1 (|isUnionMode| mp e))
- (and (pairp tmp1) (eq (qcar tmp1) '|Union|)
+ (and (consp tmp1) (eq (qcar tmp1) '|Union|)
(progn
(setq z (qcdr tmp1)) t)))
(setq ta (|hasType| x e))
@@ -14638,7 +14582,7 @@ of basic objects may not be the same.
(setq tp (|autoCoerceByModemap| tt ta))
(setq tpp (|coerce| tp m)))
tpp)
- ((and (pairp mp) (eq (qcar mp) '|Record|) (equal m |$Expression|))
+ ((and (consp mp) (eq (qcar mp) '|Record|) (equal m |$Expression|))
(list (list '|coerceRe2E| x (list 'elt (copy mp) 0)) m e))
(t nil))))
@@ -14652,8 +14596,8 @@ of basic objects may not be the same.
(fn (x)
(cond
((null x) nil)
- ((and (pairp x) (pairp (qcar x)) (eq (qcar (qcar x)) '|case|)
- (pairp (qcdr (qcar x))) (pairp (qcdr (qcdr (qcar x))))
+ ((and (consp x) (consp (qcar x)) (eq (qcar (qcar x)) '|case|)
+ (consp (qcdr (qcar x))) (consp (qcdr (qcdr (qcar x))))
(eq (qcdr (qcdr (qcdr (qcar x)))) nil))
(qcar (qcdr (qcdr (qcar x)))))
(t (fn (cdr x))))))
@@ -14739,9 +14683,9 @@ of basic objects may not be the same.
(cond
((setq td (|compCoerce1| newform newmode env))
(|coerce| td mode))
- ((and (pairp tmp1) (eq (qcar tmp1) '|Mapping|)
- (pairp (qcdr tmp1)) (eq (qcdr (qcdr tmp1)) nil)
- (pairp (qcar (qcdr tmp1)))
+ ((and (consp tmp1) (eq (qcar tmp1) '|Mapping|)
+ (consp (qcdr tmp1)) (eq (qcdr (qcdr tmp1)) nil)
+ (consp (qcar (qcdr tmp1)))
(eq (qcar (qcar (qcdr tmp1))) '|UnionCategory|))
(setq z (qcdr (qcar (qcdr tmp1))))
(when
@@ -14782,7 +14726,6 @@ of basic objects may not be the same.
\end{chunk}
\defun{coerceByModemap}{coerceByModemap}
-\calls{coerceByModemap}{pairp}
\calls{coerceByModemap}{qcar}
\calls{coerceByModemap}{qcdr}
\calls{coerceByModemap}{modeEqual}
@@ -14800,8 +14743,8 @@ of basic objects may not be the same.
(setq map (first modemap))
(setq cexpr (second modemap))
when
- (and (pairp map) (pairp (qcdr map))
- (pairp (qcdr (qcdr map)))
+ (and (consp map) (consp (qcdr map))
+ (consp (qcdr (qcdr map)))
(eq (qcdr (qcdr (qcdr map))) nil)
(or (|modeEqual| (second map) mp) (|isSubset| (second map) mp env))
(or (|modeEqual| (third map) m) (|isSubset| m (third map) env)))
@@ -14814,7 +14757,6 @@ of basic objects may not be the same.
\end{chunk}
\defun{autoCoerceByModemap}{autoCoerceByModemap}
-\calls{autoCoerceByModemap}{pairp}
\calls{autoCoerceByModemap}{qcar}
\calls{autoCoerceByModemap}{qcdr}
\calls{autoCoerceByModemap}{getModemapList}
@@ -14836,7 +14778,7 @@ of basic objects may not be the same.
(setq map (first modemap))
(setq cexpr (second modemap))
when
- (and (pairp map) (pairp (qcdr map)) (pairp (qcdr (qcdr map)))
+ (and (consp map) (consp (qcdr map)) (consp (qcdr (qcdr map)))
(eq (qcdr (qcdr (qcdr map))) nil)
(|modeEqual| (second map) target)
(|modeEqual| (third map) source))
@@ -14850,7 +14792,7 @@ of basic objects may not be the same.
result))
(when fn
(cond
- ((and (pairp source) (eq (qcar source) '|Union|)
+ ((and (consp source) (eq (qcar source) '|Union|)
(|member| target (qcdr source)))
(cond
((and (setq y (|get| x '|condition| e))
@@ -14858,8 +14800,8 @@ of basic objects may not be the same.
(loop for u in y do
(setq result
(or result
- (and (pairp u) (eq (qcar u) '|case|) (pairp (qcdr u))
- (pairp (qcdr (qcdr u)))
+ (and (consp u) (eq (qcar u) '|case|) (consp (qcdr u))
+ (consp (qcdr (qcdr u)))
(eq (qcdr (qcdr (qcdr u))) nil)
(equal (qcar (qcdr (qcdr u))) target)))))
result))
@@ -14897,7 +14839,6 @@ of basic objects may not be the same.
\end{chunk}
\defun{mkUnion}{mkUnion}
-\calls{mkUnion}{pairp}
\calls{mkUnion}{qcar}
\calls{mkUnion}{qcdr}
\calls{mkUnion}{union}
@@ -14906,14 +14847,14 @@ of basic objects may not be the same.
(defun |mkUnion| (a b)
(declare (special |$Rep|))
(cond
- ((and (eq b '$) (pairp |$Rep|) (eq (qcar |$Rep|) '|Union|))
+ ((and (eq b '$) (consp |$Rep|) (eq (qcar |$Rep|) '|Union|))
(qcdr |$Rep|))
- ((and (pairp a) (eq (qcar a) '|Union|))
+ ((and (consp a) (eq (qcar a) '|Union|))
(cond
- ((and (pairp b) (eq (qcar b) '|Union|))
+ ((and (consp b) (eq (qcar b) '|Union|))
(cons '|Union| (|union| (qcdr a) (qcdr b))))
(t (cons '|Union| (|union| (list b) (qcdr a))))))
- ((and (pairp b) (eq (qcar b) '|Union|))
+ ((and (consp b) (eq (qcar b) '|Union|))
(cons '|Union| (|union| (list a) (qcdr b))))
(t (list '|Union| a b))))
@@ -14927,7 +14868,7 @@ This orders Unions
(cond
((or (atom x) (atom y)) (equal x y))
((nequal (|#| x) (|#| y)) nil)
- ((and (pairp x) (eq (qcar x) '|Union|) (pairp y) (eq (qcar y) '|Union|))
+ ((and (consp x) (eq (qcar x) '|Union|) (consp y) (eq (qcar y) '|Union|))
(setq xl (qcdr x))
(setq yl (qcdr y))
(loop for a in xl do
@@ -14957,7 +14898,7 @@ This orders Unions
((atom m1)
(when (setq mp (car (|get| m1 '|value| env)))
(|modeEqual| mp m)))
- ((and (pairp m1) (pairp m) (equal (qcar m) (qcar m1))
+ ((and (consp m1) (consp m) (equal (qcar m) (qcar m1))
(equal (|#| (qcdr m1)) (|#| (qcdr m))))
(setq op (qcar m1))
(setq z1 (qcdr m1))
@@ -15006,23 +14947,23 @@ This orders Unions
(setq x y)
(setq u (|postTran| x))
(when
- (and (pairp u) (eq (qcar u) '|@Tuple|)
+ (and (consp u) (eq (qcar u) '|@Tuple|)
(progn
(setq tmp1 (qcdr u))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn (setq tmp2 (reverse tmp1)) t)
- (pairp tmp2)
+ (consp tmp2)
(progn
(setq tmp3 (qcar tmp2))
- (and (pairp tmp3)
+ (and (consp tmp3)
(eq (qcar tmp3) '|:|)
(progn
(setq tmp4 (qcdr tmp3))
- (and (pairp tmp4)
+ (and (consp tmp4)
(progn
(setq y (qcar tmp4))
(setq tmp5 (qcdr tmp4))
- (and (pairp tmp5)
+ (and (consp tmp5)
(eq (qcdr tmp5) nil)
(progn (setq tt (qcar tmp5)) t)))))))
(progn (setq l (qcdr tmp2)) t)
@@ -15037,7 +14978,6 @@ This orders Unions
\defun{postTran}{postTran}
\calls{postTran}{postAtom}
\calls{postTran}{postTran}
-\calls{postTran}{pairp}
\calls{postTran}{qcar}
\calls{postTran}{qcdr}
\calls{postTran}{unTuple}
@@ -15055,18 +14995,18 @@ This orders Unions
(cond
((and (atom op) (setq f (getl op '|postTran|)))
(funcall f x))
- ((and (pairp op) (eq (qcar op) '|elt|)
+ ((and (consp op) (eq (qcar op) '|elt|)
(progn
(setq tmp1 (qcdr op))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq a (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn (setq b (qcar tmp2)) t))))))
(cons (|postTran| op) (cdr (|postTran| (cons b (cdr x))))))
- ((and (pairp op) (eq (qcar op) '|Scripts|))
+ ((and (consp op) (eq (qcar op) '|Scripts|))
(|postScriptsForm| op
(dolist (y (rest x) tmp3)
(setq tmp3 (append tmp3 (|unTuple| (|postTran| y)))))))
@@ -15131,20 +15071,20 @@ This orders Unions
(defun |postTranScripts| (a)
(labels (
(fn (x)
- (if (and (pairp x) (eq (qcar x) '|@Tuple|))
+ (if (and (consp x) (eq (qcar x) '|@Tuple|))
(qcdr x)
(list x))))
(let (tmp1 tmp2 tmp3)
(cond
- ((and (pairp a) (eq (qcar a) '|PrefixSC|)
+ ((and (consp a) (eq (qcar a) '|PrefixSC|)
(progn
(setq tmp1 (qcdr a))
- (and (pairp tmp1) (eq (qcdr tmp1) nil))))
+ (and (consp tmp1) (eq (qcdr tmp1) nil))))
(|postTranScripts| (qcar tmp1)))
- ((and (pairp a) (eq (qcar a) '|;|))
+ ((and (consp a) (eq (qcar a) '|;|))
(dolist (y (qcdr a) tmp2)
(setq tmp2 (append tmp2 (|postTranScripts| y)))))
- ((and (pairp a) (eq (qcar a) '|,|))
+ ((and (consp a) (eq (qcar a) '|,|))
(dolist (y (qcdr a) tmp3)
(setq tmp3 (append tmp3 (fn (|postTran| y))))))
(t (list (|postTran| a)))))))
@@ -15170,10 +15110,10 @@ This orders Unions
(defun |postcheck| (x)
(cond
((atom x) nil)
- ((and (pairp x) (eq (qcar x) 'def) (pairp (qcdr x)))
+ ((and (consp x) (eq (qcar x) 'def) (consp (qcdr x)))
(|setDefOp| (qcar (qcdr x)))
(|postcheck| (qcdr (qcdr x))))
- ((and (pairp x) (eq (qcar x) 'quote)) nil)
+ ((and (consp x) (eq (qcar x) 'quote)) nil)
(t (|postcheck| (car x)) (|postcheck| (cdr x)))))
\end{chunk}
@@ -15223,18 +15163,18 @@ This orders Unions
(when (or (getl op '|Led|) (getl op '|Nud|) (eq op 'in)) (exit op))
(setq numOfArgs
(cond
- ((and (pairp arglp) (eq (qcdr arglp) nil) (pairp (qcar arglp))
+ ((and (consp arglp) (eq (qcdr arglp) nil) (consp (qcar arglp))
(eq (qcar (qcar arglp)) '|@Tuple|))
(|#| (qcdr (qcar arglp))))
(t 1)))
(internl '* (princ-to-string numOfArgs) (pname op))))
(cons opp arglp))
- ((and (pairp op) (eq (qcar op) '|Scripts|))
+ ((and (consp op) (eq (qcar op) '|Scripts|))
(append (|postTran| op) (|postTranList| argl)))
(t
(setq u (|postTranList| u))
(cond
- ((and (pairp u) (pairp (qcar u)) (eq (qcar (qcar u)) '|@Tuple|))
+ ((and (consp u) (consp (qcar u)) (eq (qcar (qcar u)) '|@Tuple|))
(|postError|
(cons " "
(append (|bright| u)
@@ -15242,8 +15182,8 @@ This orders Unions
" Did you misuse infix dot?"))))))
u)))
(cond
- ((and (pairp x) (pairp (qcdr x)) (eq (qcdr (qcdr x)) nil)
- (pairp (qcar (qcdr x))) (eq (qcar (qcar (qcdr x))) '|@Tuple|))
+ ((and (consp x) (consp (qcdr x)) (eq (qcdr (qcdr x)) nil)
+ (consp (qcar (qcdr x))) (eq (qcar (qcar (qcdr x))) '|@Tuple|))
(cons (car x) (qcdr (qcar (qcdr x)))))
(t x)))))
@@ -15319,7 +15259,7 @@ of the symbol being parsed. The original list read:
(defun |postCapsule| (x)
(let (op)
(cond
- ((null (and (pairp x) (progn (setq op (qcar x)) t)))
+ ((null (and (consp x) (progn (setq op (qcar x)) t)))
(|checkWarning| (list "Apparent indentation error following add")))
((or (integerp op) (eq op '==))
(list 'capsule (|postBlockItem| x)))
@@ -15348,18 +15288,18 @@ of the symbol being parsed. The original list read:
(let ((tmp1 t) tmp2 y tt z)
(setq x (|postTran| x))
(if
- (and (pairp x) (eq (qcar x) '|@Tuple|)
+ (and (consp x) (eq (qcar x) '|@Tuple|)
(progn
- (and (pairp (qcdr x))
+ (and (consp (qcdr x))
(progn (setq tmp2 (reverse (qcdr x))) t)
- (pairp tmp2)
+ (consp tmp2)
(progn
- (and (pairp (qcar tmp2)) (eq (qcar (qcar tmp2)) '|:|)
+ (and (consp (qcar tmp2)) (eq (qcar (qcar tmp2)) '|:|)
(progn
- (and (pairp (qcdr (qcar tmp2)))
+ (and (consp (qcdr (qcar tmp2)))
(progn
(setq y (qcar (qcdr (qcar tmp2))))
- (and (pairp (qcdr (qcdr (qcar tmp2))))
+ (and (consp (qcdr (qcdr (qcar tmp2))))
(eq (qcdr (qcdr (qcdr (qcar tmp2)))) nil)
(progn (setq tt (qcar (qcdr (qcdr (qcar tmp2))))) t)))))))
(progn (setq z (qcdr tmp2)) t)
@@ -15396,8 +15336,8 @@ of the symbol being parsed. The original list read:
(defun |postType| (typ)
(let (source target)
(cond
- ((and (pairp typ) (eq (qcar typ) '->) (pairp (qcdr typ))
- (pairp (qcdr (qcdr typ))) (eq (qcdr (qcdr (qcdr typ))) nil))
+ ((and (consp typ) (eq (qcar typ) '->) (consp (qcdr typ))
+ (consp (qcdr (qcdr typ))) (eq (qcdr (qcdr (qcdr typ))) nil))
(setq source (qcar (qcdr typ)))
(setq target (qcar (qcdr (qcdr typ))))
(cond
@@ -15407,8 +15347,8 @@ of the symbol being parsed. The original list read:
(list (cons '|Mapping|
(cons (|postTran| target)
(|unTuple| (|postTran| source))))))))
- ((and (pairp typ) (eq (qcar typ) '->)
- (pairp (qcdr typ)) (eq (qcdr (qcdr typ)) nil))
+ ((and (consp typ) (eq (qcar typ) '->)
+ (consp (qcdr typ)) (eq (qcdr (qcdr typ)) nil))
(list (list '|Mapping| (|postTran| (qcar (qcdr typ))))))
(t (list (|postTran| typ))))))
@@ -15501,19 +15441,19 @@ of the symbol being parsed. The original list read:
(defun |postCollect,finish| (op itl y)
(let (tmp2 tmp5 newBody)
(cond
- ((and (pairp y) (eq (qcar y) '|:|)
- (pairp (qcdr y)) (eq (qcdr (qcdr y)) nil))
+ ((and (consp y) (eq (qcar y) '|:|)
+ (consp (qcdr y)) (eq (qcdr (qcdr y)) nil))
(list 'reduce '|append| 0 (cons op (append itl (list (qcar (qcdr y)))))))
- ((and (pairp y) (eq (qcar y) '|Tuple|))
+ ((and (consp y) (eq (qcar y) '|Tuple|))
(setq newBody
(cond
((dolist (x (qcdr y) tmp2)
(setq tmp2
- (or tmp2 (and (pairp x) (eq (qcar x) '|:|)
- (pairp (qcdr x)) (eq (qcdr (qcdr x)) nil)))))
+ (or tmp2 (and (consp x) (eq (qcar x) '|:|)
+ (consp (qcdr x)) (eq (qcdr (qcdr x)) nil)))))
(|postMakeCons| (qcdr y)))
((dolist (x (qcdr y) tmp5)
- (setq tmp5 (or tmp5 (and (pairp x) (eq (qcar x) 'segment)))))
+ (setq tmp5 (or tmp5 (and (consp x) (eq (qcar x) 'segment)))))
(|tuple2List| (qcdr y)))
(t (cons '|construct| (|postTranList| (qcdr y))))))
(list 'reduce '|append| 0 (cons op (append itl (list newBody)))))
@@ -15529,8 +15469,8 @@ of the symbol being parsed. The original list read:
(let (a b)
(cond
((null args) '|nil|)
- ((and (pairp args) (pairp (qcar args)) (eq (qcar (qcar args)) '|:|)
- (pairp (qcdr (qcar args))) (eq (qcdr (qcdr (qcar args))) nil))
+ ((and (consp args) (consp (qcar args)) (eq (qcar (qcar args)) '|:|)
+ (consp (qcdr (qcar args))) (eq (qcdr (qcdr (qcar args))) nil))
(setq a (qcar (qcdr (qcar args))))
(setq b (qcdr args))
(if b
@@ -15560,8 +15500,8 @@ of the symbol being parsed. The original list read:
(setq x (car tmp3))
(setq m (nreverse (cdr tmp3)))
(cond
- ((and (pairp x) (pairp (qcar x)) (eq (qcar (qcar x)) '|elt|)
- (pairp (qcdr (qcar x))) (pairp (qcdr (qcdr (qcar x))))
+ ((and (consp x) (consp (qcar x)) (eq (qcar (qcar x)) '|elt|)
+ (consp (qcdr (qcar x))) (consp (qcdr (qcdr (qcar x))))
(eq (qcdr (qcdr (qcdr (qcar x)))) nil)
(eq (qcar (qcdr (qcdr (qcar x)))) '|construct|))
(|postCollect|
@@ -15570,8 +15510,8 @@ of the symbol being parsed. The original list read:
(t
(setq itl (|postIteratorList| m))
(setq x
- (if (and (pairp x) (eq (qcar x) '|construct|)
- (pairp (qcdr x)) (eq (qcdr (qcdr x)) nil))
+ (if (and (consp x) (eq (qcar x) '|construct|)
+ (consp (qcdr x)) (eq (qcdr (qcdr x)) nil))
(qcar (qcdr x))
x))
(|postCollect,finish| constructOp itl (|postTran| x))))))
@@ -15586,17 +15526,17 @@ of the symbol being parsed. The original list read:
(defun |postIteratorList| (args)
(let (z p y u a b)
(cond
- ((pairp args)
+ ((consp args)
(setq p (|postTran| (qcar args)))
(setq z (qcdr args))
(cond
- ((and (pairp p) (eq (qcar p) 'in) (pairp (qcdr p))
- (pairp (qcdr (qcdr p))) (eq (qcdr (qcdr (qcdr p))) nil))
+ ((and (consp p) (eq (qcar p) 'in) (consp (qcdr p))
+ (consp (qcdr (qcdr p))) (eq (qcdr (qcdr (qcdr p))) nil))
(setq y (qcar (qcdr p)))
(setq u (qcar (qcdr (qcdr p))))
(cond
- ((and (pairp u) (eq (qcar u) '|\||) (pairp (qcdr u))
- (pairp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
+ ((and (consp u) (eq (qcar u) '|\||) (consp (qcdr u))
+ (consp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
(setq a (qcar (qcdr u)))
(setq b (qcar (qcdr (qcdr u))))
(cons (list 'in y (|postInSeq| a))
@@ -15621,11 +15561,11 @@ of the symbol being parsed. The original list read:
\begin{chunk}{defun postColon}
(defun |postColon| (u)
(cond
- ((and (pairp u) (eq (qcar u) '|:|)
- (pairp (qcdr u)) (eq (qcdr (qcdr u)) nil))
+ ((and (consp u) (eq (qcar u) '|:|)
+ (consp (qcdr u)) (eq (qcdr (qcdr u)) nil))
(list '|:| (|postTran| (qcar (qcdr u)))))
- ((and (pairp u) (eq (qcar u) '|:|) (pairp (qcdr u))
- (pairp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
+ ((and (consp u) (eq (qcar u) '|:|) (consp (qcdr u))
+ (consp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
(cons '|:| (cons (|postTran| (second u)) (|postType| (third u)))))))
\end{chunk}
@@ -15642,8 +15582,8 @@ of the symbol being parsed. The original list read:
\usesdollar{postColonColon}{boot}
\begin{chunk}{defun postColonColon}
(defun |postColonColon| (u)
- (if (and $boot (pairp u) (eq (qcar u) '|::|) (pairp (qcdr u))
- (pairp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
+ (if (and $boot (consp u) (eq (qcar u) '|::|) (consp (qcdr u))
+ (consp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil))
(intern (princ-to-string (third u)) (second u))
(|postForm| u)))
@@ -15679,8 +15619,8 @@ of the symbol being parsed. The original list read:
(defun |postFlatten| (x op)
(let (a b)
(cond
- ((and (pairp x) (equal (qcar x) op) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ ((and (consp x) (equal (qcar x) op) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(setq a (qcar (qcdr x)))
(setq b (qcar (qcdr (qcdr x))))
(append (|postFlatten| a op) (|postFlatten| b op)))
@@ -15706,27 +15646,27 @@ of the symbol being parsed. The original list read:
(defun |postConstruct| (u)
(let (b a tmp4 tmp7)
(cond
- ((and (pairp u) (eq (qcar u) '|construct|)
- (pairp (qcdr u)) (eq (qcdr (qcdr u)) nil))
+ ((and (consp u) (eq (qcar u) '|construct|)
+ (consp (qcdr u)) (eq (qcdr (qcdr u)) nil))
(setq b (qcar (qcdr u)))
(setq a
- (if (and (pairp b) (eq (qcar b) '|,|))
+ (if (and (consp b) (eq (qcar b) '|,|))
(|comma2Tuple| b)
b))
(cond
- ((and (pairp a) (eq (qcar a) 'segment) (pairp (qcdr a))
- (pairp (qcdr (qcdr a))) (eq (qcdr (qcdr (qcdr a))) nil))
+ ((and (consp a) (eq (qcar a) 'segment) (consp (qcdr a))
+ (consp (qcdr (qcdr a))) (eq (qcdr (qcdr (qcdr a))) nil))
(list '|construct| (|postTranSegment| (second a) (third a))))
- ((and (pairp a) (eq (qcar a) '|@Tuple|))
+ ((and (consp a) (eq (qcar a) '|@Tuple|))
(cond
((dolist (x (qcdr a) tmp4)
(setq tmp4
(or tmp4
- (and (pairp x) (eq (qcar x) '|:|)
- (pairp (qcdr x)) (eq (qcdr (qcdr x)) nil)))))
+ (and (consp x) (eq (qcar x) '|:|)
+ (consp (qcdr x)) (eq (qcdr (qcdr x)) nil)))))
(|postMakeCons| (qcdr a)))
((dolist (x (qcdr a) tmp7)
- (setq tmp7 (or tmp7 (and (pairp x) (eq (qcar x) 'segment)))))
+ (setq tmp7 (or tmp7 (and (consp x) (eq (qcar x) 'segment)))))
(|tuple2List| (qcdr a)))
(t (cons '|construct| (|postTranList| (qcdr a))))))
(t (list '|construct| (|postTran| a)))))
@@ -15770,8 +15710,8 @@ of the symbol being parsed. The original list read:
(setq defOp (first arg))
(setq lhs (second arg))
(setq rhs (third arg))
- (if (and (pairp lhs) (eq (qcar lhs) '|macro|)
- (pairp (qcdr lhs)) (eq (qcdr (qcdr lhs)) nil))
+ (if (and (consp lhs) (eq (qcar lhs) '|macro|)
+ (consp (qcdr lhs)) (eq (qcdr (qcdr lhs)) nil))
(|postMDef| (list '==> (second lhs) rhs))
(progn
(unless $boot (|recordHeaderDocumentation| nil))
@@ -15781,7 +15721,7 @@ of the symbol being parsed. The original list read:
(setq |$maxSignatureLineNumber| 0))
(setq lhs (|postTran| lhs))
(setq tmp1
- (if (and (pairp lhs) (eq (qcar lhs) '|:|)) (cdr lhs) (list lhs nil)))
+ (if (and (consp lhs) (eq (qcar lhs) '|:|)) (cdr lhs) (list lhs nil)))
(setq form (first tmp1))
(setq targetType (second tmp1))
(when (and (null |$InteractiveMode|) (atom form)) (setq form (list form)))
@@ -15792,8 +15732,8 @@ of the symbol being parsed. The original list read:
(setq tmp1
(dolist (x form (nreverse0 tmp4))
(push
- (if (and (pairp x) (eq (qcar x) '|:|) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ (if (and (consp x) (eq (qcar x) '|:|) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(second x)
x)
tmp4)))
@@ -15804,8 +15744,8 @@ of the symbol being parsed. The original list read:
(unless (atom form)
(dolist (x (cdr form) (nreverse0 tmp6))
(push
- (when (and (pairp x) (eq (qcar x) '|:|) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ (when (and (consp x) (eq (qcar x) '|:|) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(third x))
tmp6))))
(setq typeList (cons targetType argTypeList))
@@ -15823,14 +15763,14 @@ of the symbol being parsed. The original list read:
(let (a b)
(cond
((null args) args)
- ((and (pairp args) (pairp (qcar args)) (eq (qcar (qcar args)) '|:|)
- (pairp (qcdr (qcar args))) (eq (qcdr (qcdr (qcar args))) nil))
+ ((and (consp args) (consp (qcar args)) (eq (qcar (qcar args)) '|:|)
+ (consp (qcdr (qcar args))) (eq (qcdr (qcdr (qcar args))) nil))
(setq a (qcar (qcdr (qcar args))))
(setq b (qcdr args))
(cond
(b (|postError|
(list " Argument" a "of indefinite length must be last")))
- ((or (atom a) (and (pairp a) (eq (qcar a) 'quote)))
+ ((or (atom a) (and (consp a) (eq (qcar a) 'quote)))
a)
(t
(|postError|
@@ -15870,7 +15810,7 @@ of the symbol being parsed. The original list read:
\begin{chunk}{defun postIf}
(defun |postIf| (arg)
(let (tmp1)
- (if (null (and (pairp arg) (eq (qcar arg) '|if|)))
+ (if (null (and (consp arg) (eq (qcar arg) '|if|)))
arg
(cons 'if
(dolist (x (qcdr arg) (nreverse0 tmp1))
@@ -15893,8 +15833,8 @@ of the symbol being parsed. The original list read:
\calls{postin}{postInSeq}
\begin{chunk}{defun postin}
(defun |postin| (arg)
- (if (null (and (pairp arg) (eq (qcar arg) '|in|) (pairp (qcdr arg))
- (pairp (qcdr (qcdr arg))) (eq (qcdr (qcdr (qcdr arg))) nil)))
+ (if (null (and (consp arg) (eq (qcar arg) '|in|) (consp (qcdr arg))
+ (consp (qcdr (qcdr arg))) (eq (qcdr (qcdr (qcdr arg))) nil)))
(|systemErrorHere| "postin")
(list '|in| (|postTran| (second arg)) (|postInSeq| (third arg)))))
@@ -15907,10 +15847,10 @@ of the symbol being parsed. The original list read:
\begin{chunk}{defun postInSeq}
(defun |postInSeq| (seq)
(cond
- ((and (pairp seq) (eq (qcar seq) 'segment) (pairp (qcdr seq))
- (pairp (qcdr (qcdr seq))) (eq (qcdr (qcdr (qcdr seq))) nil))
+ ((and (consp seq) (eq (qcar seq) 'segment) (consp (qcdr seq))
+ (consp (qcdr (qcdr seq))) (eq (qcdr (qcdr (qcdr seq))) nil))
(|postTranSegment| (second seq) (third seq)))
- ((and (pairp seq) (eq (qcar seq) '|@Tuple|))
+ ((and (consp seq) (eq (qcar seq) '|@Tuple|))
(|tuple2List| (qcdr seq)))
(t (|postTran| seq))))
@@ -15929,8 +15869,8 @@ of the symbol being parsed. The original list read:
\calls{postIn}{postInSeq}
\begin{chunk}{defun postIn}
(defun |postIn| (arg)
- (if (null (and (pairp arg) (eq (qcar arg) 'in) (pairp (qcdr arg))
- (pairp (qcdr (qcdr arg))) (eq (qcdr (qcdr (qcdr arg))) nil)))
+ (if (null (and (consp arg) (eq (qcar arg) 'in) (consp (qcdr arg))
+ (consp (qcdr (qcdr arg))) (eq (qcdr (qcdr (qcdr arg))) nil)))
(|systemErrorHere| "postIn")
(list 'in (|postTran| (second arg)) (|postInSeq| (third arg)))))
@@ -15951,10 +15891,10 @@ of the symbol being parsed. The original list read:
(let (a l al)
(setq a (|postTran| (cadr arg)))
(setq l (|postTranList| (cddr arg)))
- (when (and (pairp l) (eq (qcdr l) nil) (pairp (qcar l))
+ (when (and (consp l) (eq (qcdr l) nil) (consp (qcar l))
(member (qcar (qcar l)) '(attribute signature)))
(setq l (list (list 'category (qcar l)))))
- (setq al (if (and (pairp a) (eq (qcar a) '|@Tuple|)) (qcdr a) (list a)))
+ (setq al (if (and (consp a) (eq (qcar a) '|@Tuple|)) (qcdr a) (list a)))
(cons '|Join| (append al l))))
\end{chunk}
@@ -15971,8 +15911,8 @@ of the symbol being parsed. The original list read:
\calls{postMapping}{unTuple}
\begin{chunk}{defun postMapping}
(defun |postMapping| (u)
- (if (null (and (pairp u) (eq (qcar u) '->) (pairp (qcdr u))
- (pairp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil)))
+ (if (null (and (consp u) (eq (qcar u) '->) (consp (qcdr u))
+ (consp (qcdr (qcdr u))) (eq (qcdr (qcdr (qcdr u))) nil)))
u
(cons '|Mapping|
(cons (|postTran| (third u))
@@ -16008,21 +15948,21 @@ of the symbol being parsed. The original list read:
(t
(setq lhs (|postTran| lhs))
(setq tmp1
- (if (and (pairp lhs) (eq (qcar lhs) '|:|)) (cdr lhs) (list lhs nil)))
+ (if (and (consp lhs) (eq (qcar lhs) '|:|)) (cdr lhs) (list lhs nil)))
(setq form (first tmp1))
(setq targetType (second tmp1))
(setq form (if (atom form) (list form) form))
(setq newLhs
(dolist (x form (nreverse0 tmp4))
(push
- (if (and (pairp x) (eq (qcar x) '|:|) (pairp (qcdr x))) (second x) x)
+ (if (and (consp x) (eq (qcar x) '|:|) (consp (qcdr x))) (second x) x)
tmp4)))
(setq typeList
(cons targetType
(dolist (x (qcdr form) (nreverse0 tmp5))
(push
- (when (and (pairp x) (eq (qcar x) '|:|) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ (when (and (consp x) (eq (qcar x) '|:|) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(third x))
tmp5))))
(list 'mdef newLhs typeList
@@ -16076,7 +16016,7 @@ of the symbol being parsed. The original list read:
(let (op expr g)
(setq op (second arg))
(setq expr (third arg))
- (if (or |$InteractiveMode| (and (pairp expr) (eq (qcar expr) 'collect)))
+ (if (or |$InteractiveMode| (and (consp expr) (eq (qcar expr) 'collect)))
(list 'reduce op 0 (|postTran| expr))
(|postReduce|
(list '|Reduce| op
@@ -16146,8 +16086,8 @@ of the symbol being parsed. The original list read:
(defun |postFlattenLeft| (x op)
(let (a b)
(cond
- ((and (pairp x) (equal (qcar x) op) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ ((and (consp x) (equal (qcar x) op) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(setq a (qcar (qcdr x)))
(setq b (qcar (qcdr (qcdr x))))
(append (|postFlattenLeft| a op) (list b)))
@@ -16163,7 +16103,6 @@ of the symbol being parsed. The original list read:
\end{chunk}
\defun{postSignature}{postSignature}
-\calls{postSignature}{pairp}
\calls{postSignature}{postType}
\calls{postSignature}{removeSuperfluousMapping}
\calls{postSignature}{killColons}
@@ -16172,7 +16111,7 @@ of the symbol being parsed. The original list read:
(let (sig sig1 op)
(setq op (second arg))
(setq sig (third arg))
- (when (and (pairp sig) (eq (qcar sig) '->))
+ (when (and (consp sig) (eq (qcar sig) '->))
(setq sig1 (|postType| sig))
(setq op (|postAtom| (if (stringp op) (setq op (intern op)) op)))
(cons 'signature
@@ -16183,7 +16122,7 @@ of the symbol being parsed. The original list read:
\defun{removeSuperfluousMapping}{removeSuperfluousMapping}
\begin{chunk}{defun removeSuperfluousMapping}
(defun |removeSuperfluousMapping| (sig1)
- (if (and (pairp sig1) (pairp (qcar sig1)) (eq (qcar (qcar sig1)) '|Mapping|))
+ (if (and (consp sig1) (consp (qcar sig1)) (eq (qcar (qcar sig1)) '|Mapping|))
(cons (cdr (qcar sig1)) (qcdr sig1))
sig1))
@@ -16195,10 +16134,10 @@ of the symbol being parsed. The original list read:
(defun |killColons| (x)
(cond
((atom x) x)
- ((and (pairp x) (eq (qcar x) '|Record|)) x)
- ((and (pairp x) (eq (qcar x) '|Union|)) x)
- ((and (pairp x) (eq (qcar x) '|:|) (pairp (qcdr x))
- (pairp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
+ ((and (consp x) (eq (qcar x) '|Record|)) x)
+ ((and (consp x) (eq (qcar x) '|Union|)) x)
+ ((and (consp x) (eq (qcar x) '|:|) (consp (qcdr x))
+ (consp (qcdr (qcdr x))) (eq (qcdr (qcdr (qcdr x))) nil))
(|killColons| (third x)))
(t (cons (|killColons| (car x)) (|killColons| (cdr x))))))
@@ -16233,9 +16172,9 @@ of the symbol being parsed. The original list read:
\begin{chunk}{defun postTuple}
(defun |postTuple| (arg)
(cond
- ((and (pairp arg) (eq (qcdr arg) nil) (eq (qcar arg) '|@Tuple|))
+ ((and (consp arg) (eq (qcdr arg) nil) (eq (qcar arg) '|@Tuple|))
arg)
- ((and (pairp arg) (eq (qcar arg) '|@Tuple|) (pairp (qcdr arg)))
+ ((and (consp arg) (eq (qcar arg) '|@Tuple|) (consp (qcdr arg)))
(cons '|@Tuple| (|postTranList| (cdr arg))))))
\end{chunk}
@@ -16274,7 +16213,7 @@ of the symbol being parsed. The original list read:
(defun |postWhere| (arg)
(let (b x)
(setq b (third arg))
- (setq x (if (and (pairp b) (eq (qcar b) '|Block|)) (qcdr b) (list b)))
+ (setq x (if (and (consp b) (eq (qcar b) '|Block|)) (qcdr b) (list b)))
(cons '|where| (cons (|postTran| (second arg)) (|postTranList| x)))))
\end{chunk}
@@ -16296,9 +16235,9 @@ of the symbol being parsed. The original list read:
(setq |$insidePostCategoryIfTrue| t)
(setq a (|postTran| (second arg)))
(cond
- ((and (pairp a) (member (qcar a) '(signature attribute if)))
+ ((and (consp a) (member (qcar a) '(signature attribute if)))
(list 'category a))
- ((and (pairp a) (eq (qcar a) 'progn))
+ ((and (consp a) (eq (qcar a) 'progn))
(cons 'category (qcdr a)))
(t a))))
@@ -16313,8 +16252,8 @@ of the symbol being parsed. The original list read:
(defun |setDefOp| (f)
(let (tmp1)
(declare (special |$defOp| |$topOp|))
- (when (and (pairp f) (eq (qcar f) '|:|)
- (pairp (setq tmp1 (qcdr f))))
+ (when (and (consp f) (eq (qcar f) '|:|)
+ (consp (setq tmp1 (qcdr f))))
(setq f (qcar tmp1)))
(unless (atom f) (setq f (car f)))
(if |$topOp|
@@ -16363,17 +16302,17 @@ of the symbol being parsed. The original list read:
(cond
((eq op '!)
(cond
- ((and (pairp argl)
+ ((and (consp argl)
(progn
(setq f (qcar argl))
(setq tmp1 (qcdr argl))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn
(setq y (qcar tmp1))
t))))
(cond
- ((and (pairp y)
+ ((and (consp y)
(progn
(setq opprime (qcar y))
(setq yprime (qcdr y))
@@ -16390,7 +16329,7 @@ of the symbol being parsed. The original list read:
(t x)))
((progn
(setq tmp1 (|hasAplExtension| argl))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq arglAssoc (qcar tmp1))
(setq futureArgl (qcdr tmp1))
@@ -16436,12 +16375,12 @@ of the symbol being parsed. The original list read:
(let (tmp2 tmp3 y z g arglAssoc u)
(when
(dolist (x argl tmp2)
- (setq tmp2 (or tmp2 (and (pairp x) (eq (qcar x) '!)))))
+ (setq tmp2 (or tmp2 (and (consp x) (eq (qcar x) '!)))))
(setq u
(dolist (x argl (nreverse0 tmp3))
(push
- (if (and (pairp x) (eq (qcar x) '!)
- (pairp (qcdr x)) (eq (qcdr (qcdr x)) nil))
+ (if (and (consp x) (eq (qcar x) '!)
+ (consp (qcdr x)) (eq (qcdr (qcdr x)) nil))
(progn
(setq y (qcar (qcdr x)))
(setq z (|deepestExpression| y))
@@ -16458,8 +16397,8 @@ of the symbol being parsed. The original list read:
\calls{deepestExpression}{deepestExpression}
\begin{chunk}{defun deepestExpression}
(defun |deepestExpression| (x)
- (if (and (pairp x) (eq (qcar x) '!)
- (pairp (qcdr x)) (eq (qcdr (qcdr x)) nil))
+ (if (and (consp x) (eq (qcar x) '!)
+ (consp (qcdr x)) (eq (qcdr (qcdr x)) nil))
(|deepestExpression| (qcar (qcdr x)))
x))
@@ -16472,8 +16411,8 @@ of the symbol being parsed. The original list read:
(let (tmp2)
(cond
((atom u) (eq u '!))
- ((and (pairp u) (equal (qcar u) 'quote)
- (pairp (qcdr u)) (eq (qcdr (qcdr u)) nil))
+ ((and (consp u) (equal (qcar u) 'quote)
+ (consp (qcdr u)) (eq (qcdr (qcdr u)) nil))
nil)
(t
(dolist (x u tmp2)
@@ -16506,16 +16445,16 @@ of the symbol being parsed. The original list read:
(labels (
(fn (a)
(let ((tmp1 0))
- (if (and (pairp a) (eq (qcar a) '|,|))
+ (if (and (consp a) (eq (qcar a) '|,|))
(dolist (x (qcdr a) tmp1) (setq tmp1 (+ tmp1 (fn x))))
1))))
(cond
- ((and (pairp a) (eq (qcar a) '|PrefixSC|)
- (pairp (qcdr a)) (eq (qcdr (qcdr a)) nil))
+ ((and (consp a) (eq (qcar a) '|PrefixSC|)
+ (consp (qcdr a)) (eq (qcdr (qcdr a)) nil))
(strconc (princ-to-string 0) (|decodeScripts| (qcar (qcdr a)))))
- ((and (pairp a) (eq (qcar a) '|;|))
+ ((and (consp a) (eq (qcar a) '|;|))
(apply 'strconc (loop for x in (qcdr a) collect (|decodeScripts| x))))
- ((and (pairp a) (eq (qcar a) '|,|))
+ ((and (consp a) (eq (qcar a) '|,|))
(princ-to-string (fn a)))
(t
(princ-to-string 1)))))
@@ -16588,7 +16527,7 @@ of the symbol being parsed. The original list read:
\defun{unTuple}{unTuple}
\begin{chunk}{defun unTuple}
(defun |unTuple| (x)
- (if (and (pairp x) (eq (qcar x) '|@Tuple|))
+ (if (and (consp x) (eq (qcar x) '|@Tuple|))
(qcdr x)
(list x)))
@@ -18918,14 +18857,14 @@ Stack of results of reduced productions.
(let (tmp3)
(setq x (|parseTran| x))
(cond
- ((and (pairp x) (eq (qcar x) '|Record|))
+ ((and (consp x) (eq (qcar x) '|Record|))
(cond
((do ((z nil tmp3) (tmp4 (qcdr x) (cdr tmp4)) (y nil))
((or z (atom tmp4)) tmp3)
(setq y (car tmp4))
(cond
- ((null (and (pairp y) (eq (qcar y) '|:|) (pairp (qcdr y))
- (pairp (qcdr (qcdr y))) (eq (qcdr (qcdr (qcdr y))) nil)))
+ ((null (and (consp y) (eq (qcar y) '|:|) (consp (qcdr y))
+ (consp (qcdr (qcdr y))) (eq (qcdr (qcdr (qcdr y))) nil)))
(setq tmp3 (or tmp3 y)))))
(|postError| (list " Constructor" x "has missing label" )))
(t x)))
@@ -19082,12 +19021,12 @@ Stack of results of reduced productions.
(defun |tuple2List| (arg)
(let (u p q)
(declare (special |$InteractiveMode| $boot))
- (when (pairp arg)
+ (when (consp arg)
(setq u (|tuple2List| (qcdr arg)))
(cond
- ((and (pairp (qcar arg)) (eq (qcar (qcar arg)) 'segment)
- (pairp (qcdr (qcar arg)))
- (pairp (qcdr (qcdr (qcar arg))))
+ ((and (consp (qcar arg)) (eq (qcar (qcar arg)) 'segment)
+ (consp (qcdr (qcar arg)))
+ (consp (qcdr (qcdr (qcar arg))))
(eq (qcdr (qcdr (qcdr (qcar arg)))) nil))
(setq p (qcar (qcdr (qcar arg))))
(setq q (qcar (qcdr (qcdr (qcar arg)))))
@@ -20556,14 +20495,14 @@ And the {\bf s-process} function which returns a parsed version of the input.
(dolist (v (cdr u))
(hput |$envHashTable| (cons (car u) (cons (car v) nil)) t)))
(cond
- ((or (and (pairp form) (eq (qcar form) 'def))
- (and (pairp form) (eq (qcar form) '|where|)
+ ((or (and (consp form) (eq (qcar form) 'def))
+ (and (consp form) (eq (qcar form) '|where|)
(progn
(setq t1 (qcdr form))
- (and (pairp t1)
+ (and (consp t1)
(progn
(setq t2 (qcar t1))
- (and (pairp t2) (eq (qcar t2) 'def)))))))
+ (and (consp t2) (eq (qcar t2) 'def)))))))
(setq t3 (|compOrCroak| form mode env))
(setq val (car t3))
(setq newmode (second t3))
@@ -20792,12 +20731,12 @@ preferred to the underlying representation -- RDJ 9/12/83
(setq |$e| (|addDomain| mode |$e|))
(setq env |$e|)
(cond
- ((and (pairp mode) (eq (qcar mode) '|Mapping|))
+ ((and (consp mode) (eq (qcar mode) '|Mapping|))
(|compWithMappingMode| form mode env))
- ((and (pairp mode) (eq (qcar mode) 'quote)
+ ((and (consp mode) (eq (qcar mode) 'quote)
(progn
(setq tmp1 (qcdr mode))
- (and (pairp tmp1) (eq (qcdr tmp1) nil)
+ (and (consp tmp1) (eq (qcdr tmp1) nil)
(progn (setq a (qcar tmp1)) t))))
(when (equal form a) (list form mode |$e|)))
((stringp mode)
@@ -20810,23 +20749,23 @@ preferred to the underlying representation -- RDJ 9/12/83
(cond
((and (progn
(setq tmp1 (|getmode| op env))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcar tmp1) '|Mapping|)
(progn (setq ml (qcdr tmp1)) t)))
(setq u (|applyMapping| form mode env ml)))
u)
- ((and (pairp op) (eq (qcar op) 'kappa)
+ ((and (consp op) (eq (qcar op) 'kappa)
(progn
(setq tmp1 (qcdr op))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq sig (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(progn
(setq varlist (qcar tmp2))
(setq tmp3 (qcdr tmp2))
- (and (pairp tmp3)
+ (and (consp tmp3)
(eq (qcdr tmp3) nil)
(progn
(setq body (qcar tmp3))
@@ -20840,15 +20779,15 @@ preferred to the underlying representation -- RDJ 9/12/83
(t
(setq tt (|compExpression| form mode env))
(cond
- ((and (pairp tt)
+ ((and (consp tt)
(progn
(setq xprime (qcar tt))
(setq tmp1 (qcdr tt))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq mprime (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn
(setq eprime (qcar tmp2))
@@ -20940,20 +20879,20 @@ preferred to the underlying representation -- RDJ 9/12/83
(cond
((progn
(setq tmp1 (|modeIsAggregateOf| '|List| mode env))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn
(setq r (qcar tmp2)) t)))))
(|compList| form (list '|List| r) env))
((progn
(setq tmp1 (|modeIsAggregateOf| '|Vector| mode env))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2) (eq (qcdr tmp2) nil)
+ (and (consp tmp2) (eq (qcdr tmp2) nil)
(progn
(setq r (qcar tmp2)) t)))))
(|compVector| form (list '|Vector| r) env))))
@@ -21148,14 +21087,14 @@ preferred to the underlying representation -- RDJ 9/12/83
(setq env (third tmp2))
(push (car tmp2) tmp4)))
mode env))
- ((and (pairp op) (eq (qcar op) '|elt|)
+ ((and (consp op) (eq (qcar op) '|elt|)
(progn
(setq tmp3 (qcdr op))
- (and (pairp tmp3)
+ (and (consp tmp3)
(progn
(setq domain (qcar tmp3))
(setq tmp1 (qcdr tmp3))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcdr tmp1) nil)
(progn
(setq opprime (qcar tmp1))
@@ -21174,15 +21113,15 @@ preferred to the underlying representation -- RDJ 9/12/83
((and (eq opprime 'collect) (|coerceable| domain mode env))
(when (setq td (|comp| (cons opprime argl) domain env))
(|coerce| td mode)))
- ((and (pairp domain) (eq (qcar domain) '|Mapping|)
+ ((and (consp domain) (eq (qcar domain) '|Mapping|)
(setq ans
(|compForm2| (cons opprime argl) mode
(setq env (|augModemapsFromDomain1| domain domain env))
(dolist (x (|getFormModemaps| (cons opprime argl) env)
(nreverse0 tmp6))
(when
- (and (pairp x)
- (and (pairp (qcar x)) (equal (qcar (qcar x)) domain)))
+ (and (consp x)
+ (and (consp (qcar x)) (equal (qcar (qcar x)) domain)))
(push x tmp6))))))
ans)
((setq ans
@@ -21191,8 +21130,8 @@ preferred to the underlying representation -- RDJ 9/12/83
(dolist (x (|getFormModemaps| (cons opprime argl) env)
(nreverse0 tmp5))
(when
- (and (pairp x)
- (and (pairp (qcar x)) (equal (qcar (qcar x)) domain)))
+ (and (consp x)
+ (and (consp (qcar x)) (equal (qcar (qcar x)) domain)))
(push x tmp5)))))
ans)
((and (eq opprime '|construct|) (|coerceable| domain mode env))
@@ -21211,7 +21150,6 @@ preferred to the underlying representation -- RDJ 9/12/83
\end{chunk}
\defun{getFormModemaps}{getFormModemaps}
-\calls{getFormModemaps}{pairp}
\calls{getFormModemaps}{qcar}
\calls{getFormModemaps}{qcdr}
\calls{getFormModemaps}{getFormModemaps}
@@ -21230,12 +21168,12 @@ preferred to the underlying representation -- RDJ 9/12/83
(setq op (car form))
(setq argl (cdr form))
(cond
- ((and (pairp op) (eq (qcar op) '|elt|) (PAIRP (qcdr op))
- (pairp (qcdr (qcdr op))) (eq (qcdr (qcdr (qcdr op))) nil))
+ ((and (consp op) (eq (qcar op) '|elt|) (CONSP (qcdr op))
+ (consp (qcdr (qcdr op))) (eq (qcdr (qcdr (qcdr op))) nil))
(setq op1 (third op))
(setq domain (second op))
(loop for x in (|getFormModemaps| (cons op1 argl) env)
- when (and (pairp x) (pairp (qcar x)) (equal (qcar (qcar x)) domain))
+ when (and (consp x) (consp (qcar x)) (equal (qcar (qcar x)) domain))
collect x))
((null (atom op)) nil)
(t
@@ -21243,7 +21181,7 @@ preferred to the underlying representation -- RDJ 9/12/83
(when |$insideCategoryPackageIfTrue|
(setq modemapList
(loop for x in modemapList
- when (and (pairp x) (pairp (qcar x)) (nequal (qcar (qcar x)) '$))
+ when (and (consp x) (consp (qcar x)) (nequal (qcar (qcar x)) '$))
collect x)))))
(cond
((eq op '|elt|)
@@ -21263,7 +21201,6 @@ preferred to the underlying representation -- RDJ 9/12/83
\end{chunk}
\defun{eltModemapFilter}{eltModemapFilter}
-\calls{eltModemapFilter}{pairp}
\calls{eltModemapFilter}{qcar}
\calls{eltModemapFilter}{qcdr}
\calls{eltModemapFilter}{isConstantId}
@@ -21275,9 +21212,9 @@ preferred to the underlying representation -- RDJ 9/12/83
(cond
((setq z
(loop for mm in mmList
- when (and (pairp mm) (pairp (qcar mm)) (pairp (qcdr (qcar mm)))
- (pairp (qcdr (qcdr (qcar mm))))
- (pairp (qcdr (qcdr (qcdr (qcar mm)))))
+ when (and (consp mm) (consp (qcar mm)) (consp (qcdr (qcar mm)))
+ (consp (qcdr (qcdr (qcar mm))))
+ (consp (qcdr (qcdr (qcdr (qcar mm)))))
(equal (fourth (first mm)) name))
collect mm))
z)
@@ -21373,41 +21310,41 @@ preferred to the underlying representation -- RDJ 9/12/83
; the conditions are right (i.e. subsumer true whenever subsumee true)
(dolist (u modemapList)
(cond
- ((and (pairp u)
+ ((and (consp u)
(progn
(setq tmp6 (qcar u))
- (and (pairp tmp6) (progn (setq dc (qcar tmp6)) t)))
+ (and (consp tmp6) (progn (setq dc (qcar tmp6)) t)))
(progn
(setq tmp7 (qcdr u))
- (and (pairp tmp7) (eq (qcdr tmp7) nil)
+ (and (consp tmp7) (eq (qcdr tmp7) nil)
(progn
(setq tmp1 (qcar tmp7))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq cond (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2) (eq (qcdr tmp2) nil)
+ (and (consp tmp2) (eq (qcdr tmp2) nil)
(progn
(setq tmp3 (qcar tmp2))
- (and (pairp tmp3) (eq (qcar tmp3) '|Subsumed|)
+ (and (consp tmp3) (eq (qcar tmp3) '|Subsumed|)
(progn
(setq tmp4 (qcdr tmp3))
- (and (pairp tmp4)
+ (and (consp tmp4)
(progn
(setq tmp5 (qcdr tmp4))
- (and (pairp tmp5)
+ (and (consp tmp5)
(eq (qcdr tmp5) nil)
(progn
(setq nsig (qcar tmp5))
t)))))))))))))
(setq v (|assoc| (cons dc nsig) modemapList))
- (pairp v)
+ (consp v)
(progn
(setq tmp6 (qcdr v))
- (and (pairp tmp6) (eq (qcdr tmp6) nil)
+ (and (consp tmp6) (eq (qcdr tmp6) nil)
(progn
(setq tmp7 (qcar tmp6))
- (and (pairp tmp7)
+ (and (consp tmp7)
(progn
(setq ncond (qcar tmp7))
t))))))
@@ -21486,7 +21423,7 @@ preferred to the underlying representation -- RDJ 9/12/83
((null b) t)
((null (car b)) (|compFormMatch,match| (cdr a) (cdr b)))
((and (equal (car a) (car b)) (ismatch (cdr a) (cdr b)))))))
- (and (pairp mm) (pairp (qcar mm)) (pairp (qcdr (qcar mm)))
+ (and (consp mm) (consp (qcar mm)) (consp (qcdr (qcar mm)))
(ismatch (qcdr (qcdr (qcar mm))) partialModeList))))
\end{chunk}
@@ -21514,14 +21451,14 @@ preferred to the underlying representation -- RDJ 9/12/83
(declare (special |$EmptyMode|))
(setq argl (cdr form))
(cond
- ((and (pairp form) (eq (qcar form) '|elt|)
+ ((and (consp form) (eq (qcar form) '|elt|)
(progn
(setq tmp1 (qcdr form))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq a (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2) (eq (qcdr tmp2) nil))))))
+ (and (consp tmp2) (eq (qcdr tmp2) nil))))))
(when (setq tmp3 (|comp| a |$EmptyMode| env))
(setq env (third tmp3))
(|compForm1| form mode env)))
@@ -21591,23 +21528,23 @@ preferred to the underlying representation -- RDJ 9/12/83
(cond
((and (progn
(setq tmp1 (|get| form '|modemap| |$CategoryFrame|))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq tmp2 (qcar tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(progn
(setq tmp3 (qcar tmp2))
- (and (pairp tmp3)
+ (and (consp tmp3)
(progn
(setq tmp4 (qcdr tmp3))
- (and (pairp tmp4)
+ (and (consp tmp4)
(progn
(setq target (qcar tmp4))
(setq argModeList (qcdr tmp4))
t)))))
(progn
(setq tmp5 (qcdr tmp2))
- (and (pairp tmp5) (eq (qcdr tmp5) nil)))))))
+ (and (consp tmp5) (eq (qcdr tmp5) nil)))))))
(prog (t1)
(setq t1 t)
(return
@@ -21632,26 +21569,26 @@ preferred to the underlying representation -- RDJ 9/12/83
(setq ress nil)
(setq oldstyle t)
(cond
- ((and (pairp form)
+ ((and (consp form)
(eq (qcar form) '+->)
(progn
(setq tmp1 (qcdr form))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq vl (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn (setq nx (qcar tmp2)) t))))))
(setq oldstyle nil)
(cond
- ((and (pairp vl) (eq (qcar vl) '|:|))
+ ((and (consp vl) (eq (qcar vl) '|:|))
(setq ress (|compLambda| form mode oldE))
ress)
(t
(setq vl
(cond
- ((and (pairp vl)
+ ((and (consp vl)
(eq (qcar vl) '|@Tuple|)
(progn (setq vl1 (qcdr vl)) t))
vl1)
@@ -21756,10 +21693,10 @@ preferred to the underlying representation -- RDJ 9/12/83
(cond
(locals
(cond
- ((and (pairp body)
+ ((and (consp body)
(progn
(setq tmp1 (qcar body))
- (and (pairp tmp1)
+ (and (consp tmp1)
(eq (qcar tmp1) 'declare))))
(setq body
(cons (car body)
@@ -21804,16 +21741,16 @@ preferred to the underlying representation -- RDJ 9/12/83
(defun |extractCodeAndConstructTriple| (form mode oldE)
(let (tmp1 a fn op env)
(cond
- ((and (pairp form) (eq (qcar form) '|call|)
+ ((and (consp form) (eq (qcar form) '|call|)
(progn
(setq tmp1 (qcdr form))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn (setq fn (qcar tmp1)) t))))
(cond
- ((and (pairp fn) (eq (qcar fn) '|applyFun|)
+ ((and (consp fn) (eq (qcar fn) '|applyFun|)
(progn
(setq tmp1 (qcdr fn))
- (and (pairp tmp1) (eq (qcdr tmp1) nil)
+ (and (consp tmp1) (eq (qcdr tmp1) nil)
(progn (setq a (qcar tmp1)) t))))
(setq fn a)))
(list fn mode oldE))
@@ -21841,14 +21778,14 @@ preferred to the underlying representation -- RDJ 9/12/83
(defun |argsToSig| (args)
(let (tmp1 v tmp2 tt sig1 arg1 bad)
(cond
- ((and (pairp args) (eq (qcar args) '|:|)
+ ((and (consp args) (eq (qcar args) '|:|)
(progn
(setq tmp1 (qcdr args))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq v (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2)
+ (and (consp tmp2)
(eq (qcdr tmp2) nil)
(progn
(setq tt (qcar tmp2))
@@ -21860,14 +21797,14 @@ preferred to the underlying representation -- RDJ 9/12/83
(setq bad nil)
(dolist (arg args)
(cond
- ((and (pairp arg) (eq (qcar arg) '|:|)
+ ((and (consp arg) (eq (qcar arg) '|:|)
(progn
(setq tmp1 (qcdr arg))
- (and (pairp tmp1)
+ (and (consp tmp1)
(progn
(setq v (qcar tmp1))
(setq tmp2 (qcdr tmp1))
- (and (pairp tmp2) (eq (qcdr tmp2) nil)
+ (and (consp tmp2) (eq (qcdr tmp2) nil)
(progn
(setq tt (qcar tmp2))
t))))))
diff --git a/changelog b/changelog
index 2192798..c755bf5 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,61 @@
+20110916 tpd src/axiom-website/patches.html 20110916.01.tpd.patch
+20110916 tpd src/interp/vmlisp.lisp remove pairp
+20110916 tpd src/interp/topics.lisp remove pairp
+20110916 tpd src/interp/template.lisp remove pairp
+20110916 tpd src/interp/sys-pkg.lisp remove pairp
+20110916 tpd src/interp/slam.lisp remove pairp
+20110916 tpd src/interp/simpbool.lisp remove pairp
+20110916 tpd src/interp/record.lisp remove pairp
+20110916 tpd src/interp/posit.lisp remove pairp
+20110916 tpd src/interp/parsing.lisp remove pairp
+20110916 tpd src/interp/nrunopt.lisp remove pairp
+20110916 tpd src/interp/nrungo.lisp remove pairp
+20110916 tpd src/interp/nrunfast.lisp remove pairp
+20110916 tpd src/interp/nruncomp.lisp remove pairp
+20110916 tpd src/interp/newfort.lisp remove pairp
+20110916 tpd src/interp/msgdb.lisp remove pairp
+20110916 tpd src/interp/match.lisp remove pairp
+20110916 tpd src/interp/lisplib.lisp remove pairp
+20110916 tpd src/interp/iterator.lisp remove pairp
+20110916 tpd src/interp/interop.lisp remove pairp
+20110916 tpd src/interp/info.lisp remove pairp
+20110916 tpd src/interp/i-util.lisp remove pairp
+20110916 tpd src/interp/i-spec2.lisp remove pairp
+20110916 tpd src/interp/i-spec1.lisp remove pairp
+20110916 tpd src/interp/i-resolv.lisp remove pairp
+20110916 tpd src/interp/i-output.lisp remove pairp
+20110916 tpd src/interp/i-map.lisp remove pairp
+20110916 tpd src/interp/i-intern.lisp remove pairp
+20110916 tpd src/interp/i-funsel.lisp remove pairp
+20110916 tpd src/interp/i-eval.lisp remove pairp
+20110916 tpd src/interp/i-coerfn.lisp remove pairp
+20110916 tpd src/interp/i-coerce.lisp remove pairp
+20110916 tpd src/interp/i-code.lisp remove pairp
+20110916 tpd src/interp/i-analy.lisp remove pairp
+20110916 tpd src/interp/htcheck.lisp remove pairp
+20110916 tpd src/interp/ht-util.lisp remove pairp
+20110916 tpd src/interp/hashcode.lisp remove pairp
+20110916 tpd src/interp/g-util.lisp remove pairp
+20110916 tpd src/interp/g-timer.lisp remove pairp
+20110916 tpd src/interp/g-error.lisp remove pairp
+20110916 tpd src/interp/g-cndata.lisp remove pairp
+20110916 tpd src/interp/g-boot.lisp remove pairp
+20110916 tpd src/interp/functor.lisp remove pairp
+20110916 tpd src/interp/fortcall.lisp remove pairp
+20110916 tpd src/interp/format.lisp remove pairp
+20110916 tpd src/interp/compress.lisp remove pairp
+20110916 tpd src/interp/clammed.lisp remove pairp
+20110916 tpd src/interp/clam.lisp remove pairp
+20110916 tpd src/interp/cattable.lisp remove pairp
+20110916 tpd src/interp/category.lisp remove pairp
+20110916 tpd src/interp/c-util.lisp remove pairp
+20110916 tpd src/interp/c-doc.lisp remove pairp
+20110916 tpd src/interp/buildom.lisp remove pairp
+20110916 tpd src/interp/br-con.lisp remove pairp
+20110916 tpd src/interp/apply.lisp remove pairp
+20110916 tpd books/bookvol9 remove pairp
+20110916 tpd books/bookvol5 remove pairp
+20110916 tpd books/bookvol10.3 remove pairp
20110911 mxr src/axiom-website/patches.html 20110911.02.mxr.patch
20110911 mxr books/bookvol10.3 upgrade GOPT
20110911 tpd src/axiom-website/patches.html 20110911.01.tpd.patch
diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html
index 62572a6..1c0fbea 100644
--- a/src/axiom-website/patches.html
+++ b/src/axiom-website/patches.html
@@ -3620,5 +3620,7 @@ books/bookvol10.3 add BasicStochasticDifferential domain, Wilfrid Kendall
books/bookvol10.3 add StochasticDifferential
20110911.02.mxr.patch
books/bookvol10.3 upgrade GOPT
+20110916.01.tpd.patch
+src/interp/vmlisp.lisp remove pairp