From eaa29c2ce5bbe7e00348733ae8255f51c8746005 Mon Sep 17 00:00:00 2001 From: Tim Daly Date: Mon, 18 May 2015 07:20:05 -0400 Subject: [PATCH] src/interp/vmlisp.lisp remove spaddifference rename spaddifference to -, i.e. standard common lisp name --- books/bookvol5.pamphlet | 52 +++----- changelog | 48 +++++++ patch | 5 +- src/axiom-website/patches.html | 2 + src/interp/br-con.lisp.pamphlet | 112 ++++++++-------- src/interp/buildom.lisp.pamphlet | 2 +- src/interp/c-doc.lisp.pamphlet | 56 ++++---- src/interp/c-util.lisp.pamphlet | 18 ++-- src/interp/category.lisp.pamphlet | 4 +- src/interp/cattable.lisp.pamphlet | 2 +- src/interp/clam.lisp.pamphlet | 6 +- src/interp/clammed.lisp.pamphlet | 2 +- src/interp/fortcall.lisp.pamphlet | 50 ++++---- src/interp/functor.lisp.pamphlet | 8 +- src/interp/g-timer.lisp.pamphlet | 14 +- src/interp/g-util.lisp.pamphlet | 8 +- src/interp/hashcode.lisp.pamphlet | 2 +- src/interp/i-analy.lisp.pamphlet | 12 +- src/interp/i-coerce.lisp.pamphlet | 14 +- src/interp/i-coerfn.lisp.pamphlet | 86 ++++++------ src/interp/i-eval.lisp.pamphlet | 4 +- src/interp/i-funsel.lisp.pamphlet | 14 +- src/interp/i-map.lisp.pamphlet | 4 +- src/interp/i-output.lisp.pamphlet | 262 ++++++++++++++++++------------------ src/interp/i-spec1.lisp.pamphlet | 12 +- src/interp/i-spec2.lisp.pamphlet | 2 +- src/interp/i-util.lisp.pamphlet | 6 +- src/interp/info.lisp.pamphlet | 2 +- src/interp/interop.lisp.pamphlet | 6 +- src/interp/match.lisp.pamphlet | 44 +++--- src/interp/nag-c02.lisp.pamphlet | 4 +- src/interp/nag-c05.lisp.pamphlet | 6 +- src/interp/nag-d01.lisp.pamphlet | 20 ++-- src/interp/nag-e02.lisp.pamphlet | 78 ++++++------ src/interp/nag-e04.lisp.pamphlet | 4 +- src/interp/nag-f01.lisp.pamphlet | 8 +- src/interp/nag-f04.lisp.pamphlet | 24 ++-- src/interp/nag-s.lisp.pamphlet | 28 ++-- src/interp/newfort.lisp.pamphlet | 76 ++++++------ src/interp/nruncomp.lisp.pamphlet | 8 +- src/interp/nrunfast.lisp.pamphlet | 4 +- src/interp/nrungo.lisp.pamphlet | 10 +- src/interp/nrunopt.lisp.pamphlet | 28 ++-- src/interp/parsing.lisp.pamphlet | 6 +- src/interp/record.lisp.pamphlet | 6 +- src/interp/slam.lisp.pamphlet | 2 +- src/interp/sys-pkg.lisp.pamphlet | 2 +- src/interp/template.lisp.pamphlet | 6 +- src/interp/topics.lisp.pamphlet | 6 +- src/interp/vmlisp.lisp.pamphlet | 5 +- 50 files changed, 612 insertions(+), 578 deletions(-) diff --git a/books/bookvol5.pamphlet b/books/bookvol5.pamphlet index 1d743c0..40793fb 100644 --- a/books/bookvol5.pamphlet +++ b/books/bookvol5.pamphlet @@ -1201,7 +1201,6 @@ compute the delta(i)s stored in \verb|$frameRecord|. \calls{undo}{userError} \calls{undo}{qcdr} \calls{undo}{qcar} -\calls{undo}{spaddifference} \calls{undo}{identp} \calls{undo}{undoSteps} \calls{undo}{undoCount} @@ -1258,7 +1257,6 @@ compute the delta(i)s stored in \verb|$frameRecord|. -- Thus, the later requires one extra undo at the end. \end{verbatim} \calls{undoSteps}{writeInputLines} -\calls{undoSteps}{spaddifference} \calls{undoSteps}{recordFrame} \calls{undoSteps}{copy} \calls{undoSteps}{undoSingleStep} @@ -1271,7 +1269,7 @@ compute the delta(i)s stored in \verb|$frameRecord|. (defun |undoSteps| (m beforeOrAfter) (let (tmp1 tmp2 systemDelta lastTailSeen env) (declare (special |$IOindex| |$InteractiveFrame| |$frameRecord|)) - (|writeInputLines| '|redo| (spaddifference |$IOindex| m)) + (|writeInputLines| '|redo| (- |$IOindex| m)) (recordFrame 'normal) (setq env (copy (caar |$InteractiveFrame|))) (do ((i 0 (1+ i)) (framelist |$frameRecord| (cdr framelist))) @@ -1412,7 +1410,6 @@ Removing undo lines from \verb|)hist )write linelist| \calls{removeUndoLines}{charPosition} \calls{removeUndoLines}{maxindex} \calls{removeUndoLines}{undoCount} -\calls{removeUndoLines}{spaddifference} \calls{removeUndoLines}{concat} \usesdollar{removeUndoLines}{currentLine} \usesdollar{removeUndoLines}{IOindex} @@ -1508,7 +1505,7 @@ Removing undo lines from \verb|)hist )write linelist| ((eql n 0) (return nil)) (t - (setq n (spaddifference n 1)) + (setq n (- n 1)) (setq y (cdr y)))))))) (cond ((and y (not (eql code #\b))) @@ -1592,7 +1589,6 @@ Properties of r :: \end{chunk} \Defun{undoCount}{Undo previous n commands} -\calls{undoCount}{spaddifference} \calls{undoCount}{userError} \calls{undoCount}{concat} \usesdollar{undoCount}{IOindex} @@ -1605,8 +1601,8 @@ Properties of r :: (progn (setq m (cond - ((>= n 0) (spaddifference (spaddifference |$IOindex| n) 1)) - (t (spaddifference n)))) + ((>= n 0) (- (- |$IOindex| n) 1)) + (t (- n)))) (cond ((>= m |$IOindex|) (|userError| @@ -2823,7 +2819,6 @@ untraceDomainConstructor,keepTraced?} \calls{getAliasIfTracedMapParameter}{isSharpVarWithNum} \calls{getAliasIfTracedMapParameter}{get} \calls{getAliasIfTracedMapParameter}{exit} -\calls{getAliasIfTracedMapParameter}{spaddifference} \calls{getAliasIfTracedMapParameter}{string2pint-n} \calls{getAliasIfTracedMapParameter}{substring} \calls{getAliasIfTracedMapParameter}{pname} @@ -2842,7 +2837,7 @@ untraceDomainConstructor,keepTraced?} (|get| |currentFunction| 'alias |$InteractiveFrame|)) (exit (elt |aliasList| - (spaddifference + (- (string2pint-n (substring (pname x) 1 nil) 1) 1)))))) (t x)))))) @@ -31137,7 +31132,6 @@ Also used in the output routines. \calls{writeInputLines}{sayKeyedMsg} \calls{writeInputLines}{throwKeyedMsg} \calls{writeInputLines}{size} -\calls{writeInputLines}{spaddifference} \calls{writeInputLines}{concat} \calls{writeInputLines}{substring} \calls{writeInputLines}{readHiFi} @@ -31166,7 +31160,7 @@ Also used in the output routines. (t (setq maxn 72) (setq breakChars (cons '| | (cons '+ nil))) - (do ((tmp0 (spaddifference |$IOindex| 1)) + (do ((tmp0 (- |$IOindex| 1)) (i initial (+ i 1))) ((> i tmp0) nil) (setq vecl (car (|readHiFi| i))) @@ -31178,7 +31172,7 @@ Also used in the output routines. (setq done nil) (do ((j 1 (1+ j))) ((or (> j maxn) (null (null done))) nil) - (setq k (spaddifference (1+ maxn) j)) + (setq k (- (1+ maxn) j)) (when (member (elt vec k) breakChars) (setq svec (concat (substring vec 0 (1+ k)) underbar)) (setq lineList (cons svec lineList)) @@ -31220,7 +31214,6 @@ Also used in the output routines. \end{chunk} \defun{changeHistListLen}{changeHistListLen} \calls{changeHistListLen}{sayKeyedMsg} -\calls{changeHistListLen}{spaddifference} \usesdollar{changeHistListLen}{HistListLen} \usesdollar{changeHistListLen}{HistList} \usesdollar{changeHistListLen}{HistListAct} @@ -31235,7 +31228,7 @@ Also used in the output routines. and your argument, %1 , is not one.") (list n)) ; only positive integers (progn - (setq dif (spaddifference n |$HistListLen|)) + (setq dif (- n |$HistListLen|)) (setq |$HistListLen| n) (setq l (cdr |$HistList|)) (cond @@ -31244,7 +31237,7 @@ Also used in the output routines. ((> i dif) nil) (setq l (cons nil l)))) ((minusp dif) - (do ((tmp0 (spaddifference dif)) + (do ((tmp0 (- dif)) (i 1 (1+ i))) ((> i tmp0) nil) (setq l (cdr l))) @@ -31365,7 +31358,6 @@ Also used in the output routines. \end{chunk} \defun{undoInCore}{undoInCore} \calls{undoInCore}{undoChanges} -\calls{undoInCore}{spaddifference} \calls{undoInCore}{readHiFi} \calls{undoInCore}{disableHist} \calls{undoInCore}{assq} @@ -31387,7 +31379,7 @@ Also used in the output routines. ((> i |$HistListLen|) nil) (setq li (cdr li))) (|undoChanges| li) - (setq n (spaddifference (spaddifference |$IOindex| n) 1)) + (setq n (- (- |$IOindex| n) 1)) (and (> n 0) (if |$HiFiAccess| @@ -31714,7 +31706,6 @@ Also used in the output routines. \end{chunk} \defun{fetchOutput}{fetchOutput} \calls{fetchOutput}{boot-equal} -\calls{fetchOutput}{spaddifference} \calls{fetchOutput}{getI} \calls{fetchOutput}{throwKeyedMsg} \calls{fetchOutput}{readHiFi} @@ -31724,7 +31715,7 @@ Also used in the output routines. (defun |fetchOutput| (n) (let (vec Alist val) (cond - ((and (boot-equal n (spaddifference 1)) (setq val (|getI| '% '|value|))) + ((and (boot-equal n (- 1)) (setq val (|getI| '% '|value|))) val) (|$HiFiAccess| (setq n @@ -32191,7 +32182,6 @@ back. \calls{dewritify,dewritifyInner}{concat} \calls{dewritify,dewritifyInner}{vmread} \calls{dewritify,dewritifyInner}{make-instream} -\calls{dewritify,dewritifyInner}{spaddifference} \calls{dewritify,dewritifyInner}{qcar} \calls{dewritify,dewritifyInner}{qcdr} \calls{dewritify,dewritifyInner}{qrplaca} @@ -32302,7 +32292,7 @@ back. tmp1) (setq fval (scale-float (float signif fval) expon)) (when (minusp sign) - (exit (spaddifference fval))) + (exit (- fval))) (exit fval)))) (exit (|error| "Unknown type to de-writify."))))) (when (consp ob) @@ -32370,7 +32360,7 @@ back. (|ScanOrPairVec,ScanOrInner| f (qcdr ob))) (when (vecp ob) (hput |$seen| ob t) - (do ((tmp0 (spaddifference (|#| ob) 1)) (i 0 (1+ i))) + (do ((tmp0 (- (|#| ob) 1)) (i 0 (1+ i))) ((> i tmp0) nil) (|ScanOrPairVec,ScanOrInner| f (elt ob i)))) (when (funcall f ob) (throw '|ScanOrPairVecAnswer| t)) @@ -32403,21 +32393,20 @@ back. (progn (setq p (pname g)) (setq n 0) - (do ((tmp0 (spaddifference (|#| p) 1)) (i 2 (1+ i))) + (do ((tmp0 (- (|#| p) 1)) (i 2 (1+ i))) ((> i tmp0) nil) (setq n (+ (* 10 n) (|charDigitVal| (elt p i))))) n)))) \end{chunk} \defun{charDigitVal}{charDigitVal} -\calls{charDigitVal}{spaddifference} \calls{charDigitVal}{error} \begin{chunk}{defun charDigitVal} (defun |charDigitVal| (c) (let (digits n) (setq digits "0123456789") - (setq n (spaddifference 1)) - (do ((tmp0 (spaddifference (|#| digits) 1)) (i 0 (1+ i))) + (setq n (- 1)) + (do ((tmp0 (- (|#| digits) 1)) (i 0 (1+ i))) ((or (> i tmp0) (null (minusp n))) nil) (if (char= c (elt digits i)) (setq n i) @@ -33886,7 +33875,6 @@ explanations see the list structure section \ref{Theliststructure}. \calls{displaySetVariableSettings}{specialChar} \calls{displaySetVariableSettings}{concat} \calls{displaySetVariableSettings}{satisfiesUserLevel} -\calls{displaySetVariableSettings}{spaddifference} \calls{displaySetVariableSettings}{poundsign} \calls{displaySetVariableSettings}{eval} \calls{displaySetVariableSettings}{bright} @@ -33915,11 +33903,11 @@ explanations see the list structure section \ref{Theliststructure}. (setq setoption (|object2String| (first setdata))) (setq setoption (concat setoption - (|fillerSpaces| (spaddifference 13 (|#| setoption)) " ") + (|fillerSpaces| (- 13 (|#| setoption)) " ") (second setdata))) (setq setoption (concat setoption - (|fillerSpaces| (spaddifference 55 (|#| setoption)) " "))) + (|fillerSpaces| (- 55 (|#| setoption)) " "))) (case (fourth setdata) (function (setq opt @@ -55025,7 +55013,7 @@ This is a list with the fields (return (SEQ (progn (setq |$path| - (TAKE (SPADDIFFERENCE (LASTATOM setTree)) + (TAKE (- (LASTATOM setTree)) |$path|)) (setq page (|htInitPage| (|mkSetTitle|) nil)) (|htpSetProperty| page '|setTree| setTree) @@ -55060,7 +55048,7 @@ This is a list with the fields (setq tabset1 (PRINC-TO-STRING maxWidth1)) (setq tabset2 (PRINC-TO-STRING - (SPADDIFFERENCE + (- (+ maxWidth2 maxWidth1) 1))) (|htSay| "\\tab{2}\\newline Variable\\tab{" (PRINC-TO-STRING diff --git a/changelog b/changelog index 5752f72..4ecc23a 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,51 @@ +20150518 tpd src/axiom-website/patches.html 20150518.01.tpd.patch +20150518 tpd books/bookvol5 remove spaddifference +20150518 tpd src/interp/br-con.lisp remove spaddifference +20150518 tpd src/interp/buildom.lisp remove spaddifference +20150518 tpd src/interp/c-doc.lisp remove spaddifference +20150518 tpd src/interp/c-util.lisp remove spaddifference +20150518 tpd src/interp/category.lisp remove spaddifference +20150518 tpd src/interp/cattable.lisp remove spaddifference +20150518 tpd src/interp/clam.lisp remove spaddifference +20150518 tpd src/interp/clammed.lisp remove spaddifference +20150518 tpd src/interp/fortcall.lisp remove spaddifference +20150518 tpd src/interp/functor.lisp remove spaddifference +20150518 tpd src/interp/g-timer.lisp remove spaddifference +20150518 tpd src/interp/g-util.lisp remove spaddifference +20150518 tpd src/interp/hashcode.lisp remove spaddifference +20150518 tpd src/interp/i-analy.lisp remove spaddifference +20150518 tpd src/interp/i-coerce.lisp remove spaddifference +20150518 tpd src/interp/i-coerfn.lisp remove spaddifference +20150518 tpd src/interp/i-eval.lisp remove spaddifference +20150518 tpd src/interp/i-funsel.lisp remove spaddifference +20150518 tpd src/interp/i-map.lisp remove spaddifference +20150518 tpd src/interp/i-output.lisp remove spaddifference +20150518 tpd src/interp/i-spec1.lisp remove spaddifference +20150518 tpd src/interp/i-spec2.lisp remove spaddifference +20150518 tpd src/interp/i-util.lisp remove spaddifference +20150518 tpd src/interp/info.lisp remove spaddifference +20150518 tpd src/interp/interop.lisp remove spaddifference +20150518 tpd src/interp/match.lisp remove spaddifference +20150518 tpd src/interp/nag-c02.lisp remove spaddifference +20150518 tpd src/interp/nag-c05.lisp remove spaddifference +20150518 tpd src/interp/nag-d01.lisp remove spaddifference +20150518 tpd src/interp/nag-e02.lisp remove spaddifference +20150518 tpd src/interp/nag-e04.lisp remove spaddifference +20150518 tpd src/interp/nag-f01.lisp remove spaddifference +20150518 tpd src/interp/nag-f04.lisp remove spaddifference +20150518 tpd src/interp/nag-s.lisp remove spaddifference +20150518 tpd src/interp/newfort.lisp remove spaddifference +20150518 tpd src/interp/nruncomp.lisp remove spaddifference +20150518 tpd src/interp/nrunfast.lisp remove spaddifference +20150518 tpd src/interp/nrungo.lisp remove spaddifference +20150518 tpd src/interp/nrunopt.lisp remove spaddifference +20150518 tpd src/interp/parsing.lisp remove spaddifference +20150518 tpd src/interp/record.lisp remove spaddifference +20150518 tpd src/interp/slam.lisp remove spaddifference +20150518 tpd src/interp/sys-pkg.lisp remove spaddifference +20150518 tpd src/interp/template.lisp remove spaddifference +20150518 tpd src/interp/topics.lisp remove spaddifference +20150518 tpd src/interp/vmlisp.lisp remove spaddifference 20150515 tpd src/axiom-website/patches.html 20150515.01.tpd.patch 20150515 tpd src/interp/vmlisp.lisp revert from broken version 20150508 tpd src/axiom-website/patches.html 20150508.02.tpd.patch diff --git a/patch b/patch index 5062994..ee807be 100644 --- a/patch +++ b/patch @@ -1,4 +1,3 @@ -src/interp/vmlisp.lisp revert from broken version +src/interp/vmlisp.lisp remove spaddifference -Over-optimization of this file caused build breakage. Revert -the version until fixed. +rename spaddifference to -, i.e. standard common lisp name diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html index ad2651a..23aec82 100644 --- a/src/axiom-website/patches.html +++ b/src/axiom-website/patches.html @@ -5060,6 +5060,8 @@ books/bookvolbib add Robe15 reference
books/bookvol*pamphlet add more test cases
20150515.01.tpd.patch src/interp/vmlisp.lisp revert from broken version
+20150518.01.tpd.patch +src/interp/vmlisp.lisp remove spaddifference
diff --git a/src/interp/br-con.lisp.pamphlet b/src/interp/br-con.lisp.pamphlet index 0cf1ed5..bc89b77 100644 --- a/src/interp/br-con.lisp.pamphlet +++ b/src/interp/br-con.lisp.pamphlet @@ -72,7 +72,7 @@ (setq |count| (+ |count| 1))) ((BOOT-EQUAL |c| (|char| '})) (setq |count| - (SPADDIFFERENCE |count| 1)) + (- |count| 1)) (COND ((MINUSP |count|) (setq |missingLeft| 'T))))))))) @@ -343,7 +343,7 @@ ((EQL |n| 1) (CONS (SUBSTRING |line| 0 |k|) (|dbSpreadComments| (SUBSTRING |line| (+ |k| 1) NIL) 0))) - ('T (|dbSplit| |line| (SPADDIFFERENCE |n| 1) |k|))))) + ('T (|dbSplit| |line| (- |n| 1) |k|))))) ;dbSpreadComments(line,n) == ; line = '"" => nil @@ -367,11 +367,11 @@ ((NEQUAL (ELT |line| (+ |k| 1)) (|char| '-)) (setq |u| (|dbSpreadComments| |line| |k|)) (CONS (STRCONC (SUBSTRING |line| |n| - (SPADDIFFERENCE |k| |n|)) + (- |k| |n|)) (CAR |u|)) (CDR |u|))) ('T - (CONS (SUBSTRING |line| |n| (SPADDIFFERENCE |k| |n|)) + (CONS (SUBSTRING |line| |n| (- |k| |n|)) (|dbSpreadComments| (SUBSTRING |line| |k| NIL) 0))))))))) ;--============================================================================ @@ -2102,7 +2102,7 @@ ((NULL |args|) |exp|) ('T (|sublisFormal,sublisFormal1| |args| |exp| - (SPADDIFFERENCE (|#| |args|) 1)))))))) + (- (|#| |args|) 1)))))))) ;--======================================================================= ;-- Build Table of Lower Case Constructor Names @@ -3596,7 +3596,7 @@ (COND ((AND (BOOT-EQUAL |what| "Condition") (NULL (KAR (KAR |data|)))) - (setq |dataCount| (SPADDIFFERENCE |dataCount| 1)))) + (setq |dataCount| (- |dataCount| 1)))) (setq |exposurePart| (COND (|$exposedOnlyIfTrue| '(" Exposed ")) @@ -4717,7 +4717,7 @@ (setq |newkey| (CAR |LETTMP#1|)) (setq |binkey| (CADR |LETTMP#1|)) (setq |innerData| - (CDDR (ELT |data| (SPADDIFFERENCE |newkey| 1)))) + (CDDR (ELT |data| (- |newkey| 1)))) (|dbReduceOpAlist| |opAlist| (ELT |innerData| |binkey|) '|signatures|)))) ('T (CONS (ELT |opAlist| |key|) NIL))))))) @@ -5654,7 +5654,7 @@ '|conditions|)) (|htpSetProperty| |htPage| '|conditionData| |condata|))) - (setq |base| (SPADDIFFERENCE 8192)) + (setq |base| (- 8192)) (setq |exactlyOneOpSig| (AND (CONSP |opAlist|) (EQ (QCDR |opAlist|) NIL) (PROGN @@ -7623,7 +7623,7 @@ ((NULL (IDENTP |t|)) (|bcConform| |t| 'T)) ('T (setq |k| (|position| |t| |$conargs|)) (COND - ((> |k| (SPADDIFFERENCE 1)) + ((> |k| (- 1)) (setq |typeOfArg| (ELT (CDR |$signature|) |k|)) (|addWhereList| |t| '|member| |typeOfArg|))) (|htSay| "{\\em " |t| "}")))))) @@ -7690,7 +7690,7 @@ (AND (|stringPrefix?| "\\s{" |doc|) (setq |k| 3)))) (setq |n| (|charPosition| |$charRbrace| |doc| |k|)) - (setq |s| (SUBSTRING |doc| |k| (SPADDIFFERENCE |n| |k|))) + (setq |s| (SUBSTRING |doc| |k| (- |n| |k|))) (setq |parse| (|ncParseFromString| |s|)) (COND ((AND (CONSP |parse|) (EQUAL (QCAR |parse|) |op|) @@ -8342,7 +8342,7 @@ (EXIT (SETQ G173535 (CONS - (+ (SPADDIFFERENCE 1) + (+ (- 1) (|#| |sig|)) G173535))))))))) (setq |acc| NIL) @@ -10044,7 +10044,7 @@ (setq G174630 NIL) (RETURN (DO ((G174636 NIL G174630) - (G174637 (SPADDIFFERENCE (MAXINDEX |s|) 1)) + (G174637 (- (MAXINDEX |s|) 1)) (|i| 0 (QSADD1 |i|))) ((OR G174636 (QSGREATERP |i| G174637)) G174630) @@ -10059,7 +10059,7 @@ (OR (EQL |i| 0) (NEQUAL (ELT |s| - (SPADDIFFERENCE |i| 1)) + (- |i| 1)) (|char| |$charUnderscore|))))))))))) (CONS '|error| (CONS "Illegal search string" @@ -10330,10 +10330,10 @@ (SETQ G174821 (OR G174821 |k|)))))))))) (EXIT (STRCONC (SUBSTRING |s| |i| - (+ (SPADDIFFERENCE |n| |i|) 1)) + (+ (- |n| |i|) 1)) |$charUnderscore| (|pmPreparse,gn| |s| (+ |n| 1) |j|)))) - (EXIT (SUBSTRING |s| |i| (+ (SPADDIFFERENCE |j| |i|) 1))))))) + (EXIT (SUBSTRING |s| |i| (+ (- |j| |i|) 1))))))) (defun |pmPreparse,fn| (|s| |n| |siz|) (PROG (|i| |j| |t| |middle|) @@ -10344,19 +10344,19 @@ (RETURN (SUBSTRING |s| |n| NIL)))) (setq |j| (OR (|firstDelim| |s| (+ |i| 1)) |siz|)) (setq |t| - (|pmPreparse,gn| |s| |i| (SPADDIFFERENCE |j| 1))) + (|pmPreparse,gn| |s| |i| (- |j| 1))) (setq |middle| (SEQ (IF (|member| |t| '("and" "or" "not")) (EXIT |t|)) (IF (BOOT-EQUAL (ELT |t| 0) (|char| '|"|)) (EXIT |t|)) - (IF (AND (> (SPADDIFFERENCE |siz| 1) |j|) + (IF (AND (> (- |siz| 1) |j|) (BOOT-EQUAL (ELT |s| |j|) (|char| '|(|))) (EXIT |t|)) (EXIT (STRCONC (|char| '|"|) |t| (|char| '|"|))))) - (EXIT (STRCONC (SUBSTRING |s| |n| (SPADDIFFERENCE |i| |n|)) + (EXIT (STRCONC (SUBSTRING |s| |n| (- |i| |n|)) |middle| (|pmPreparse,fn| |s| |j| |siz|))))))) @@ -10458,7 +10458,7 @@ (|doc?| (setq N (PARSE-INTEGER (|dbPart| |line| 1 - (SPADDIFFERENCE 1)))) + (- 1)))) (COND ((NUMBERP N) (FILE-POSITION |instream2| N) @@ -10664,13 +10664,13 @@ (IF (OR (MINUSP |startpos|) (> |startpos| |n|)) (|error| '|index out of range|) NIL) (setq |k| |startpos|) - (DO ((G174993 (SPADDIFFERENCE |n| 1)) + (DO ((G174993 (- |n| 1)) (|i| |startpos| (+ |i| 1))) ((OR (> |i| G174993) (NULL (OR (NEQUAL |c| (ELT |t| |i|)) (AND (> |i| |startpos|) (BOOT-EQUAL - (ELT |t| (SPADDIFFERENCE |i| 1)) + (ELT |t| (- |i| 1)) '_))))) NIL) (SEQ (EXIT (setq |k| (+ |k| 1))))) @@ -10680,7 +10680,7 @@ (PROG (|max| |i| |f|) (RETURN (SEQ (setq |max| (+ (MAXINDEX |s|) 1)) - (setq |f| (SPADDIFFERENCE 1)) + (setq |f| (- 1)) (EXIT (PROG (G175010) (setq G175010 NIL) (RETURN @@ -10694,7 +10694,7 @@ (SEQ (EXIT (SETQ G175010 (CONS (SUBSTRING |s| |i| - (SPADDIFFERENCE |f| |i|)) + (- |f| |i|)) G175010)))))))))))) (defun |mkGrepPattern1,remUnderscores| (|s|) @@ -11726,7 +11726,7 @@ (defun |dbGetName| (|line|) (declare (special |$tick|)) (SUBSTRING |line| 1 - (SPADDIFFERENCE (|charPosition| |$tick| |line| 1) 1))) + (- (|charPosition| |$tick| |line| 1) 1))) ;pluralSay(count,singular,plural,:options) == ; item := (options is [x,:options] => x; '"") @@ -11932,7 +11932,7 @@ (PROGN (setq |kind| (CAR G175764)) (setq |lines| (CDR G175764)) - (|dbGather| |kind| |lines| (SPADDIFFERENCE |index| 1) 'T))))) + (|dbGather| |kind| |lines| (- |index| 1) 'T))))) ;sayDocMessage message == ; htSay('"{\em ") @@ -12012,7 +12012,7 @@ ((NULL (AND (> |n| 0) (BOOT-EQUAL |progress| 'T))) NIL) (SEQ (EXIT (PROGN - (setq |n| (SPADDIFFERENCE |n| 1)) + (setq |n| (- |n| 1)) (setq |k| (|charPosition| (|char| '|`|) |s| 0)) @@ -12034,7 +12034,7 @@ (PROG (|max| |n|) (RETURN (SEQ (PROGN - (setq |n| (SPADDIFFERENCE 1)) + (setq |n| (- 1)) (setq |max| (MAXINDEX |s|)) (DO () ((NULL (<= (setq |n| @@ -12594,22 +12594,22 @@ (IF (AND (AND (AND (AND (AND (AND (> |m| 6) (BOOT-EQUAL - (ELT |a| (SPADDIFFERENCE |m| 5)) + (ELT |a| (- |m| 5)) (|char| '[))) (BOOT-EQUAL - (ELT |a| (SPADDIFFERENCE |m| 4)) + (ELT |a| (- |m| 4)) (|char| '^))) (BOOT-EQUAL - (ELT |a| (SPADDIFFERENCE |m| 3)) + (ELT |a| (- |m| 3)) |$tick|)) (BOOT-EQUAL - (ELT |a| (SPADDIFFERENCE |m| 2)) + (ELT |a| (- |m| 2)) (|char| ']))) - (BOOT-EQUAL (ELT |a| (SPADDIFFERENCE |m| 1)) + (BOOT-EQUAL (ELT |a| (- |m| 1)) (|char| '*))) (BOOT-EQUAL (ELT |a| |m|) |$tick|)) (EXIT (|mkDetailedGrepPattern,simp| - (SUBSTRING |a| 0 (SPADDIFFERENCE |m| 5))))) + (SUBSTRING |a| 0 (- |m| 5))))) (EXIT |a|))))) (defun |mkDetailedGrepPattern,conc| (|a| |b|) @@ -12675,7 +12675,7 @@ (OR (STRPOS "->" |s| 0 NIL) (RETURN |s|))) (COND - ((BOOT-EQUAL (ELT |s| (SPADDIFFERENCE |k| 1)) + ((BOOT-EQUAL (ELT |s| (- |k| 1)) (|char| '|)|)) (STRCONC (|char| '|(|) |s|)) ('T @@ -12695,7 +12695,7 @@ (IF (> (setq |m| (|charPosition| (|char| '$) |s| |i|)) |n|) (EXIT (SUBSTRING |s| |i| NIL))) - (EXIT (STRCONC (SUBSTRING |s| |i| (SPADDIFFERENCE |m| |i|)) + (EXIT (STRCONC (SUBSTRING |s| |i| (- |m| |i|)) "_$" (|underscoreDollars,fn| |s| (+ |m| 1) |n|))))))) @@ -12735,7 +12735,7 @@ (PROG (|firstPart| |key| |address| |instream|) (RETURN (PROGN - (setq |firstPart| (|dbPart| |line| 1 (SPADDIFFERENCE 1))) + (setq |firstPart| (|dbPart| |line| 1 (- 1))) (setq |key| (INTERN (SUBSTRING |firstPart| 0 1))) (setq |address| (SUBSTRING |firstPart| 1 NIL)) (setq |instream| (OPEN (|grepSource| |key|))) @@ -14702,7 +14702,7 @@ (declare (special |$tick|)) (|escapeString| (SUBSTRING |line| 1 - (SPADDIFFERENCE (|charPosition| |$tick| |line| 1) 1)))) + (- (|charPosition| |$tick| |line| 1) 1)))) ;dbAttr line == STRCONC(dbName line,escapeString dbPart(line,4,0)) @@ -14718,12 +14718,12 @@ (COND ((EQL |n| 1) (SUBSTRING |line| (+ |k| 1) - (SPADDIFFERENCE - (SPADDIFFERENCE + (- + (- (|charPosition| |$tick| |line| (+ |k| 1)) |k|) 1))) ('T - (|dbPart| |line| (SPADDIFFERENCE |n| 1) + (|dbPart| |line| (- |n| 1) (|charPosition| |$tick| |line| (+ |k| 1)))))) ;dbXParts(line,n,m) == @@ -14754,10 +14754,10 @@ ((EQL |n| 0) NIL) ('T (CONS (SUBSTRING |line| |m| - (+ (SPADDIFFERENCE |m|) + (+ (- |m|) (setq |k| (|charPosition| |$tick| |line| |m|)))) - (|dbParts| |line| (SPADDIFFERENCE |n| 1) (+ |k| 1)))))))) + (|dbParts| |line| (- |n| 1) (+ |k| 1)))))))) ;dbConname(line) == dbPart(line,5,1) @@ -14783,7 +14783,7 @@ (BOOT-EQUAL |kind| (|char| '|o|))) (setq |conform| (|dbPart| |line| 5 1)) (setq |k| (|charPosition| (|char| '|(|) |conform| 1)) - (SUBSTRING |conform| 1 (SPADDIFFERENCE |k| 1))) + (SUBSTRING |conform| 1 (- |k| 1))) ('T (|dbName| |line|)))))) ;dbTickIndex(line,n,k) == --returns index of nth tick in line starting at k @@ -14795,7 +14795,7 @@ (COND ((EQL |n| 1) (|charPosition| |$tick| |line| |k|)) ('T - (|dbTickIndex| |line| (SPADDIFFERENCE |n| 1) + (|dbTickIndex| |line| (- |n| 1) (+ 1 (|charPosition| |$tick| |line| |k|)))))) ;mySort u == listSort(function GLESSEQP,u) @@ -15598,7 +15598,7 @@ (RETURN (PROGN (setq |fromAlist| (|htpProperty| |htPage| '|fromAlist|)) - (setq |index| (SPADDIFFERENCE |count| 2)) + (setq |index| (- |count| 2)) (setq |LETTMP#1| (ELT |fromAlist| |index|)) (setq |con| (CAR |LETTMP#1|)) (setq |alist| (CDR |LETTMP#1|)) @@ -15626,7 +15626,7 @@ (setq |index| (CAR |LETTMP#1|)) (setq |binkey| (CADR |LETTMP#1|)) (setq |LETTMP#1| - (ELT |fromAlist| (SPADDIFFERENCE |index| 2))) + (ELT |fromAlist| (- |index| 2))) (setq |con| (CAR |LETTMP#1|)) (setq |alist| (CDR |LETTMP#1|)) (setq |item| (ELT |alist| |binkey|)) @@ -17263,7 +17263,7 @@ (CONS '|bcStrings| (CONS (CONS - (SPADDIFFERENCE |w| + (- |w| (|#| (princ-to-string |par|))) (CONS |argstring| (CONS |parname| @@ -18186,7 +18186,7 @@ (KDR |coSig|)) (|htSayValue| |t|) (|htSayIndentRel| - (SPADDIFFERENCE 15) 'T) + (- 15) 'T) (|htSayStandard| "\\newline "))))))) (COND @@ -18195,7 +18195,7 @@ (|htSay| "{\\em Returns:}") (|htSayIndentRel| 15 'T) (|htSayValue| (CAR |$sig|)) - (|htSayIndentRel| (SPADDIFFERENCE 15) 'T)) + (|htSayIndentRel| (- 15) 'T)) ('T NIL)))) (COND ((AND |origin| @@ -18210,7 +18210,7 @@ |$includeUnexposed?|) (|htSayUnexposed|))) (|bcConform| |origin| 'T) - (|htSayIndentRel| (SPADDIFFERENCE 15)))) + (|htSayIndentRel| (- 15)))) (COND ((NULL (member |predicate| '(T ASCONST))) (setq |pred| @@ -18230,7 +18230,7 @@ (|htSayIndentRel| 15 (> |count| 1)) (setq |firstTime| NIL) (|bcPred| |p| |$conform| 'T) - (|htSayIndentRel| (SPADDIFFERENCE 15) + (|htSayIndentRel| (- 15) (> |count| 1)) (|htSayStandard| "\\newline "))))))) @@ -18249,7 +18249,7 @@ "of category ") ('T "the domain "))) (|bcConform| |conform| 'T 'T) - (|htSayIndentRel| (SPADDIFFERENCE 15) 'T))) + (|htSayIndentRel| (- 15) 'T))) (DO ((G179556 |$whereList| (CDR G179556)) (G179464 NIL)) ((OR (ATOM G179556) @@ -18275,7 +18275,7 @@ (|sublisFormal| (KDR |conform|) |t|)) (|htSayIndentRel| - (SPADDIFFERENCE 15) + (- 15) (> |count| 1)))))))))) (COND ((AND |doc| (NEQUAL |doc| "") @@ -18316,7 +18316,7 @@ (SUBSTITUTE |$charNewline| |$charFauxNewline| |doc|)))) (|htSay| |ndoc|))) - (|htSayIndentRel| (SPADDIFFERENCE 15)))) + (|htSayIndentRel| (- 15)))) (COND ((BOOT-EQUAL |which| "constructor") (COND @@ -18325,12 +18325,12 @@ (|htSayStandard| "\\tab{2}{\\em Abbreviation:}") (|htSayIndentRel| 15) (|htSay| |abbr|) - (|htSayIndentRel| (SPADDIFFERENCE 15)) + (|htSayIndentRel| (- 15)) (|htSayStandard| "\\newline{}"))) (|htSayStandard| "\\tab{2}{\\em Source File:}") (|htSayIndentRel| 15) (|htSaySourceFile| |conname|) - (|htSayIndentRel| (SPADDIFFERENCE 15)))) + (|htSayIndentRel| (- 15)))) (COND ((AND |exactlyOneOpSig| (setq |infoAlist| diff --git a/src/interp/buildom.lisp.pamphlet b/src/interp/buildom.lisp.pamphlet index e83f3d4..2ab9c16 100644 --- a/src/interp/buildom.lisp.pamphlet +++ b/src/interp/buildom.lisp.pamphlet @@ -717,7 +717,7 @@ (RETURN (SEQ (PROGN (setq |args| (ELT |dom| 5)) - (setq |val| (SPADDIFFERENCE 1)) + (setq |val| (- 1)) (SEQ (DO ((G166353 |args| (CDR G166353)) (|v| NIL) (|i| 0 (QSADD1 |i|))) ((OR (ATOM G166353) diff --git a/src/interp/c-doc.lisp.pamphlet b/src/interp/c-doc.lisp.pamphlet index 23c89b5..c3b33bd 100644 --- a/src/interp/c-doc.lisp.pamphlet +++ b/src/interp/c-doc.lisp.pamphlet @@ -343,7 +343,7 @@ (+ |k| 1))) (> |n| |j|)) (SUBSTRING |s| (+ |k| 1) - (SPADDIFFERENCE (SPADDIFFERENCE |j| |k|) 1))) + (- (- |j| |k|) 1))) ('T (|checkDocError| (CONS "Ill-formed lisp expression : " @@ -513,7 +513,7 @@ (setq |k| (|htcharPosition| (|char| '%) |line| 0)) (COND ((EQL |k| 0) "") - ((OR (>= |k| (SPADDIFFERENCE |n| 1)) + ((OR (>= |k| (- |n| 1)) (NEQUAL (ELT |line| (+ |k| 1)) (|char| '%))) |line|) ((> (|#| |line|) |k|) (SUBSTRING |line| 0 |k|)) @@ -539,7 +539,7 @@ ((BOOT-EQUAL |k| |m|) |k|) ((> |k| 0) (COND - ((NEQUAL (ELT |line| (SPADDIFFERENCE |k| 1)) |$charBack|) + ((NEQUAL (ELT |line| (- |k| 1)) |$charBack|) |k|) ('T (|htcharPosition| |char| |line| (+ |k| 1))))) ('T 0)))))) @@ -624,7 +624,7 @@ (SEQ (EXIT (PROGN (setq |k| (|firstNonBlankPosition| |x|)) (COND - ((BOOT-EQUAL |k| (SPADDIFFERENCE 1)) + ((BOOT-EQUAL |k| (- 1)) (COND (|verbatim| (setq |u2| @@ -664,7 +664,7 @@ (STRCONC "\\indented{" (princ-to-string - (SPADDIFFERENCE |k| + (- |k| |margin|)) "}{" (|checkAddSpaceSegments| @@ -687,7 +687,7 @@ ((NULL (STRINGP |l|)) (CONS |l| NIL)) ('T (setq |m| (MAXINDEX |l|)) (COND - ((BOOT-EQUAL |m| (SPADDIFFERENCE 1)) NIL) + ((BOOT-EQUAL |m| (- 1)) NIL) ('T (setq |i| 0) (PROG (G167196) (setq G167196 NIL) @@ -787,7 +787,7 @@ (|char| '})) |m|)) (|checkGetArgs| - (SUBSTRING |u| 6 (SPADDIFFERENCE |k| 6)))) + (SUBSTRING |u| 6 (- |k| 6)))) ((> (setq |i| (|charPosition| (|char| '|(|) |u| 0)) |m|) NIL) @@ -804,14 +804,14 @@ (CONS (|trimString| (SUBSTRING |u| (+ |i| 1) - (SPADDIFFERENCE - (SPADDIFFERENCE |k| |i|) + (- + (- |k| |i|) 1))) |acc|)) (setq |i| |k|))))) (NREVERSE (CONS (SUBSTRING |u| (+ |i| 1) - (SPADDIFFERENCE (SPADDIFFERENCE |m| |i|) + (- (- |m| |i|) 1)) |acc|)))))))))) @@ -827,12 +827,12 @@ (PROGN (setq |k| (|firstNonBlankPosition| |x|)) (COND - ((BOOT-EQUAL |k| (SPADDIFFERENCE 1)) + ((BOOT-EQUAL |k| (- 1)) "\\blankline ") ((BOOT-EQUAL |margin| |k|) |x|) ('T (STRCONC "\\indented{" - (princ-to-string (SPADDIFFERENCE |k| |margin|)) + (princ-to-string (- |k| |margin|)) "}{" (|checkAddSpaceSegments| (SUBSTRING |x| |k| NIL) 0) "}"))))))) @@ -864,7 +864,7 @@ (|char| '| |)))) NIL) (SEQ (EXIT '|continue|))) - (setq |n| (SPADDIFFERENCE |j| |i|)) + (setq |n| (- |j| |i|)) (COND ((> |n| 1) (STRCONC (SUBSTRING |u| 0 |i|) @@ -1007,7 +1007,7 @@ ((NEQUAL (setq |k| (|firstNonBlankPosition| |u| (+ |j| 1))) - (SPADDIFFERENCE 1)) + (- 1)) (CONS (SUBSTRING |u| (+ |j| 1) NIL) (CDR |lines|))) ('T (CDR |lines|)))) @@ -1025,7 +1025,7 @@ (setq |k| (|firstNonBlankPosition| |line|)) - (SPADDIFFERENCE 1)) + (- 1)) '|skip|) ((> |k| |margin|) '|skip|) ((NULL @@ -1178,9 +1178,9 @@ (COND ((> |count| 0) (setq |mathSymbolsOk| - (SPADDIFFERENCE |count| 1)) + (- |count| 1)) (setq |spadflag| - (SPADDIFFERENCE |count| 1))) + (- |count| 1))) ('T (|checkDocError| (CONS @@ -1203,7 +1203,7 @@ (setq |count| (+ |count| 1))) ((BOOT-EQUAL |x| |$charRbrace|) (setq |count| - (SPADDIFFERENCE |count| 1)) + (- |count| 1)) (COND ((BOOT-EQUAL |mathSymbolsOk| |count|) @@ -1661,29 +1661,29 @@ ('T (setq |lastchar| (ELT |x| |m|)) (COND ((AND (BOOT-EQUAL |lastchar| |$charPeriod|) - (BOOT-EQUAL (ELT |x| (SPADDIFFERENCE |m| 1)) + (BOOT-EQUAL (ELT |x| (- |m| 1)) |$charPeriod|)) (COND ((EQL |m| 1) (CONS |x| NIL)) ((AND (> |m| 3) - (BOOT-EQUAL (ELT |x| (SPADDIFFERENCE |m| 2)) + (BOOT-EQUAL (ELT |x| (- |m| 2)) |$charPeriod|)) (APPEND (|checkSplitPunctuation| - (SUBSTRING |x| 0 (SPADDIFFERENCE |m| 2))) + (SUBSTRING |x| 0 (- |m| 2))) (CONS "..." NIL))) ('T (APPEND (|checkSplitPunctuation| - (SUBSTRING |x| 0 (SPADDIFFERENCE |m| 1))) + (SUBSTRING |x| 0 (- |m| 1))) (CONS ".." NIL))))) ((OR (BOOT-EQUAL |lastchar| |$charPeriod|) (BOOT-EQUAL |lastchar| |$charSemiColon|) (BOOT-EQUAL |lastchar| |$charComma|)) (CONS (SUBSTRING |x| 0 |m|) (CONS |lastchar| NIL))) ((AND (> |m| 1) - (BOOT-EQUAL (ELT |x| (SPADDIFFERENCE |m| 1)) + (BOOT-EQUAL (ELT |x| (- |m| 1)) |$charQuote|)) - (CONS (SUBSTRING |x| 0 (SPADDIFFERENCE |m| 1)) - (CONS (SUBSTRING |x| (SPADDIFFERENCE |m| 1) NIL) + (CONS (SUBSTRING |x| 0 (- |m| 1)) + (CONS (SUBSTRING |x| (- |m| 1) NIL) NIL))) ((> |m| (setq |k| (|charPosition| |$charBack| |x| 0))) (COND @@ -1739,7 +1739,7 @@ (BOOT-EQUAL (ELT |x| 0) |char|)) (RETURN (setq |k| - (SPADDIFFERENCE 1)))) + (- 1)))) ('T (setq |k| (|charPosition| |char| |x| 0)) @@ -1747,14 +1747,14 @@ ((AND (> |k| 0) (BOOT-EQUAL (ELT |x| - (SPADDIFFERENCE |k| 1)) + (- |k| 1)) |$charBack|)) (CONS |x| NIL)) ((<= |k| |m|) (RETURN |k|)))))) (setq |l| (CDR |l|)))))) (COND ((NULL |l|) (CONS |x| NIL)) - ((BOOT-EQUAL |k| (SPADDIFFERENCE 1)) (CONS |char| NIL)) + ((BOOT-EQUAL |k| (- 1)) (CONS |char| NIL)) ((EQL |k| 0) (CONS |char| (CONS (SUBSTRING |x| 1 NIL) NIL))) ((BOOT-EQUAL |k| (MAXINDEX |x|)) diff --git a/src/interp/c-util.lisp.pamphlet b/src/interp/c-util.lisp.pamphlet index fc8c658..714a7ee 100644 --- a/src/interp/c-util.lisp.pamphlet +++ b/src/interp/c-util.lisp.pamphlet @@ -72,7 +72,7 @@ (DEFUN |up| () (declare (special |$level|)) - (|displayComp| (setq |$level| (SPADDIFFERENCE |$level| 1)))) + (|displayComp| (setq |$level| (- |$level| 1)))) ; ;SAME() == same() @@ -318,7 +318,7 @@ (DEFUN |mkErrorExpr| (|level|) (declare (special |$s|)) (|mkErrorExpr,bracket| - (ASSOCLEFT (DROP (SPADDIFFERENCE |level| (|#| |$s|)) |$s|)))) + (ASSOCLEFT (DROP (- |level| (|#| |$s|)) |$s|)))) ; ;compAndTrace [x,m,e] == @@ -864,10 +864,10 @@ (DEFUN |makeCommonEnvironment,fn| (|x| |y| |nx| |ny|) (SEQ (IF (> |nx| |ny|) (EXIT (|makeCommonEnvironment,fn| (CDR |x|) |y| - (SPADDIFFERENCE |nx| 1) |ny|))) + (- |nx| 1) |ny|))) (IF (> |ny| |nx|) (EXIT (|makeCommonEnvironment,fn| |x| (CDR |y|) |nx| - (SPADDIFFERENCE |ny| 1)))) + (- |ny| 1)))) (EXIT (CONS |x| (CONS |y| NIL))))) ;;; *** |makeCommonEnvironment,makeSameLength| REDEFINED @@ -948,7 +948,7 @@ (DEFUN |printEnv,tran| (|val| |prop|) (SEQ (IF (BOOT-EQUAL |prop| '|value|) - (EXIT (DROP (SPADDIFFERENCE 1) |val|))) + (EXIT (DROP (- 1) |val|))) (EXIT |val|))) ;;; *** |printEnv| REDEFINED @@ -1019,7 +1019,7 @@ (DEFUN |prEnv,tran| (|val| |prop|) (SEQ (IF (BOOT-EQUAL |prop| '|value|) - (EXIT (DROP (SPADDIFFERENCE 1) |val|))) + (EXIT (DROP (- 1) |val|))) (EXIT |val|))) ;;; *** |prEnv| REDEFINED @@ -1533,7 +1533,7 @@ (DEFUN |decExitLevel| (|u|) (PROGN - (|adjExitLevel| |u| 1 (SPADDIFFERENCE 1)) + (|adjExitLevel| |u| 1 (- 1)) (|decExitLevel,removeExit0| |u|))) ; @@ -1844,7 +1844,7 @@ (COND ((AND |$scanIfTrue| (BOOT-EQUAL |$insideCapsuleFunctionIfTrue| 'T) - (> (SPADDIFFERENCE (|#| |$semanticErrorStack|) + (> (- (|#| |$semanticErrorStack|) |$initCapsuleErrorCount|) 3)) (THROW '|compCapsuleBody| NIL)) @@ -2037,7 +2037,7 @@ (setq |currentTime| (get-internal-run-time)) (setq |elapsedSeconds| (QUOTIENT - (TIMES (SPADDIFFERENCE |currentTime| + (TIMES (- |currentTime| |$previousTime|) 1.0) |$timerTicksPerSecond|)) diff --git a/src/interp/category.lisp.pamphlet b/src/interp/category.lisp.pamphlet index ee57038..ad889a6 100644 --- a/src/interp/category.lisp.pamphlet +++ b/src/interp/category.lisp.pamphlet @@ -364,7 +364,7 @@ of category object. '|domain|) |count|) ('T - (SPADDIFFERENCE + (- |count| 5)))) (setq |nsig| (|mkOperatorEntry| @@ -412,7 +412,7 @@ of category object. (COND ((NULL (NULL |PrincipalAncestor|)) (DO ((G166290 - (SPADDIFFERENCE (SIZE |PrincipalAncestor|) 1)) + (- (SIZE |PrincipalAncestor|) 1)) (|x| 6 (+ |x| 1))) ((> |x| G166290) NIL) (SEQ (EXIT (SETELT |v| |x| diff --git a/src/interp/cattable.lisp.pamphlet b/src/interp/cattable.lisp.pamphlet index 17162a9..f6d7409 100644 --- a/src/interp/cattable.lisp.pamphlet +++ b/src/interp/cattable.lisp.pamphlet @@ -680,7 +680,7 @@ (|sublisFormal| (CDR |conform|) (GETDATABASE |conname| 'PREDICATES)))) (|simpHasPred| - (ELT |predvec| (SPADDIFFERENCE |k| 1)))))))))))) + (ELT |predvec| (- |k| 1)))))))))))) ;simpCatHasAttribute(domform,attr) == ; conform := getConstructorForm opOf domform diff --git a/src/interp/clam.lisp.pamphlet b/src/interp/clam.lisp.pamphlet index 0bc8c4a..2b7691f 100644 --- a/src/interp/clam.lisp.pamphlet +++ b/src/interp/clam.lisp.pamphlet @@ -1635,7 +1635,7 @@ ('T (CONS '| (| (CONS - (SPADDIFFERENCE |kind| + (- |kind| |empties|) (CONS '/ (CONS |kind| @@ -1984,7 +1984,7 @@ (COND ((> |n| 1) (setq |rTotal| - (SPADDIFFERENCE + (- (+ |rTotal| |n|) 1)))) (setq |nForms| (+ |nForms| 1)) (|typeTimePrin| @@ -2325,7 +2325,7 @@ ((> SIZE |maxWidth|) (|keyedSystemError| "%1 is too large" (CONS |x| NIL))) ('T - (CONS (|fillerSpaces| (SPADDIFFERENCE |maxWidth| SIZE) '| |) + (CONS (|fillerSpaces| (- |maxWidth| SIZE) '| |) (CONS |x| NIL)))))))) ;domainEqualList(argl1,argl2) == diff --git a/src/interp/clammed.lisp.pamphlet b/src/interp/clammed.lisp.pamphlet index 33d3a24..ab19634 100644 --- a/src/interp/clammed.lisp.pamphlet +++ b/src/interp/clammed.lisp.pamphlet @@ -492,7 +492,7 @@ ((AND (NEQUAL (|#| |cl|) (|#| |argl|)) (GENSYMP (|last| |argl|))) (setq |argl| - (DROP (SPADDIFFERENCE 1) |argl|)))) + (DROP (- 1) |argl|)))) (COND ((NEQUAL (|#| |cl|) (|#| |argl|)) NIL) ('T diff --git a/src/interp/fortcall.lisp.pamphlet b/src/interp/fortcall.lisp.pamphlet index a7acc14..c73ff73 100644 --- a/src/interp/fortcall.lisp.pamphlet +++ b/src/interp/fortcall.lisp.pamphlet @@ -1415,7 +1415,7 @@ (SEQ (PROG (G166685) (setq G166685 NIL) (RETURN - (DO ((G166690 (SPADDIFFERENCE (|#| (ELT |z| 0)) 1)) + (DO ((G166690 (- (|#| (ELT |z| 0)) 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166690) G166685) (SEQ (EXIT (SETQ G166685 @@ -1452,7 +1452,7 @@ (SEQ (PROG (G166717) (setq G166717 NIL) (RETURN - (DO ((G166722 (SPADDIFFERENCE (|#| |u|) 1)) + (DO ((G166722 (- (|#| |u|) 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166722) (NREVERSE0 G166717)) (SEQ (EXIT (SETQ G166717 @@ -1466,7 +1466,7 @@ (SEQ (PROG (G166734) (setq G166734 NIL) (RETURN - (DO ((G166739 (SPADDIFFERENCE (|#| |u|) 1)) + (DO ((G166739 (- (|#| |u|) 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166739) (NREVERSE0 G166734)) (SEQ (EXIT (SETQ G166734 @@ -1659,7 +1659,7 @@ (SEQ (PROGN (SETQ RESULTS |l|) (setq |spadForms| NIL) - (DO ((G166820 (SPADDIFFERENCE (|#| |l|) 1)) + (DO ((G166820 (- (|#| |l|) 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166820) NIL) (SEQ (EXIT (PROGN @@ -1720,7 +1720,7 @@ (RETURN (DO ((G166848 - (SPADDIFFERENCE + (- (CAR |dims|) 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| @@ -1743,7 +1743,7 @@ NIL))) ((EQL (|#| |dims|) 2) (DO ((G166860 - (SPADDIFFERENCE (CAR |dims|) 1)) + (- (CAR |dims|) 1)) (|r| 0 (QSADD1 |r|))) ((QSGREATERP |r| G166860) NIL) (SEQ @@ -1752,7 +1752,7 @@ (setq |innerEls| NIL) (DO ((G166869 - (SPADDIFFERENCE + (- (SECOND |dims|) 1)) (|c| 0 (QSADD1 |c|))) ((QSGREATERP |c| G166869) @@ -1804,7 +1804,7 @@ (RETURN (DO ((G166882 - (SPADDIFFERENCE |dim| + (- |dim| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| @@ -1845,7 +1845,7 @@ (COND ((EQL (|#| |dims|) 2) (DO ((G166907 - (SPADDIFFERENCE (CAR |dims|) 1)) + (- (CAR |dims|) 1)) (|r| 0 (QSADD1 |r|))) ((QSGREATERP |r| G166907) NIL) (SEQ @@ -1854,7 +1854,7 @@ (setq |innerEls| NIL) (DO ((G166914 - (SPADDIFFERENCE + (- (SECOND |dims|) 1)) (|c| 0 (QSADD1 |c|))) ((QSGREATERP |c| G166914) @@ -1917,7 +1917,7 @@ (RETURN (DO ((G166942 - (SPADDIFFERENCE + (- (CAR |dims|) 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| @@ -1934,7 +1934,7 @@ NIL))) ((EQL (|#| |dims|) 2) (DO ((G166952 - (SPADDIFFERENCE (CAR |dims|) 1)) + (- (CAR |dims|) 1)) (|r| 0 (QSADD1 |r|))) ((QSGREATERP |r| G166952) NIL) (SEQ @@ -1943,7 +1943,7 @@ (setq |innerEls| NIL) (DO ((G166959 - (SPADDIFFERENCE + (- (SECOND |dims|) 1)) (|c| 0 (QSADD1 |c|))) ((QSGREATERP |c| G166959) @@ -1968,7 +1968,7 @@ (setq |jDim| (SECOND |dims|)) (setq |kDim| (THIRD |dims|)) (DO ((G166974 - (SPADDIFFERENCE |iDim| 1)) + (- |iDim| 1)) (|r| 0 (QSADD1 |r|))) ((QSGREATERP |r| G166974) NIL) (SEQ @@ -1977,7 +1977,7 @@ (setq |middleEls| NIL) (DO ((G166986 - (SPADDIFFERENCE |jDim| 1)) + (- |jDim| 1)) (|c| 0 (QSADD1 |c|))) ((QSGREATERP |c| G166986) NIL) @@ -1987,7 +1987,7 @@ (setq |innerEls| NIL) (DO ((G166995 - (SPADDIFFERENCE |kDim| + (- |kDim| 1)) (|p| 0 (QSADD1 |p|))) ((QSGREATERP |p| @@ -2378,14 +2378,14 @@ |planes|)) (DO ((G167167 - (SPADDIFFERENCE |planes| 1)) + (- |planes| 1)) (|k| 0 (QSADD1 |k|))) ((QSGREATERP |k| G167167) NIL) (SEQ (EXIT (DO ((G167174 - (SPADDIFFERENCE |cols| 1)) + (- |cols| 1)) (|j| 0 (QSADD1 |j|))) ((QSGREATERP |j| G167174) NIL) @@ -2393,7 +2393,7 @@ (EXIT (DO ((G167181 - (SPADDIFFERENCE |rows| 1)) + (- |rows| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G167181) NIL) @@ -2409,14 +2409,14 @@ (TIMES |rows| |cols|)) (DO ((G167188 - (SPADDIFFERENCE |cols| 1)) + (- |cols| 1)) (|j| 0 (QSADD1 |j|))) ((QSGREATERP |j| G167188) NIL) (SEQ (EXIT (DO ((G167195 - (SPADDIFFERENCE |rows| 1)) + (- |rows| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G167195) NIL) @@ -2426,7 +2426,7 @@ (ELT (ELT |v| |i|) |j|))))))))))) ('T (|xdrWrite| |xstr| |rows|) (DO ((G167202 - (SPADDIFFERENCE |rows| 1)) + (- |rows| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G167202) NIL) (SEQ (EXIT @@ -2728,7 +2728,7 @@ ('T (setq |vars| (CONS (CADR |f|) NIL)))) (setq |body| (COPY-TREE (CADDR |f|))) (setq |newVariable| (GENSYM)) - (DO ((G167360 (SPADDIFFERENCE (|#| |vars|) 1)) + (DO ((G167360 (- (|#| |vars|) 1)) (|index| 0 (QSADD1 |index|))) ((QSGREATERP |index| G167360) NIL) (SEQ (EXIT (setq |body| @@ -2845,7 +2845,7 @@ (CONS '|construct| NIL))) |jacBodies|)))) (setq |newVariable| (GENSYM)) - (DO ((G167410 (SPADDIFFERENCE (|#| |vars|) 1)) + (DO ((G167410 (- (|#| |vars|) 1)) (|index| 0 (QSADD1 |index|))) ((QSGREATERP |index| G167410) NIL) (SEQ (EXIT (PROGN @@ -2927,7 +2927,7 @@ ('T (setq |vars| (CONS (CADR |f|) NIL)))) (setq |funBodies| (COPY-TREE (CDADDR |f|))) (setq |newVariable| (GENSYM)) - (DO ((G167432 (SPADDIFFERENCE (|#| |vars|) 1)) + (DO ((G167432 (- (|#| |vars|) 1)) (|index| 0 (QSADD1 |index|))) ((QSGREATERP |index| G167432) NIL) (SEQ (EXIT (setq |funBodies| diff --git a/src/interp/functor.lisp.pamphlet b/src/interp/functor.lisp.pamphlet index 9cf13e5..72a6258 100644 --- a/src/interp/functor.lisp.pamphlet +++ b/src/interp/functor.lisp.pamphlet @@ -2301,14 +2301,14 @@ (BOOT-EQUAL (LASSOC |name| (ELT |copyvec| |j|)) - (SPADDIFFERENCE + (- (+ |count| |j|) |i|)))) NIL) (SEQ (EXIT (setq |j| (+ |j| 1))))) (setq |j| - (SPADDIFFERENCE |j| 1)) + (- |j| 1)) (COND ((> |j| (+ |i| 2)) (PROGN @@ -2319,7 +2319,7 @@ (SETELT |copyvec| |k| (|delete| (CONS |name| - (SPADDIFFERENCE + (- (+ |count| |k|) |i|)) @@ -2700,7 +2700,7 @@ ('T 'ELT)) (CONS '$ (CONS 5 NIL))) (CONS - (SPADDIFFERENCE (|#| |$locals|) + (- (|#| |$locals|) (|#| |u|)) (CONS |code| NIL))))) (setq |$epilogue| diff --git a/src/interp/g-timer.lisp.pamphlet b/src/interp/g-timer.lisp.pamphlet index e3cb7f7..f04bff4 100644 --- a/src/interp/g-timer.lisp.pamphlet +++ b/src/interp/g-timer.lisp.pamphlet @@ -71,8 +71,8 @@ (|sayBrightly| (|concat| (|bright| |strname|) (|fillerSpaces| - (SPADDIFFERENCE - (SPADDIFFERENCE 70 + (- + (- 70 (|#| |strname|)) (|#| |strval|)) ".") @@ -82,7 +82,7 @@ (|sayBrightly| (|concat| (|bright| "Total") (|fillerSpaces| - (SPADDIFFERENCE 65 + (- 65 (|#| (princ-to-string |total|))) ".") (|bright| (princ-to-string |total|))))))))) @@ -519,12 +519,12 @@ (setq |currentTime| (|elapsedUserTime|)) (setq |currentGCTime| (|elapsedGcTime|)) (setq |gcDelta| - (SPADDIFFERENCE |currentGCTime| |$oldElapsedGCTime|)) + (- |currentGCTime| |$oldElapsedGCTime|)) (setq |elapsedSeconds| (QUOTIENT (TIMES 1.0 - (SPADDIFFERENCE - (SPADDIFFERENCE |currentTime| + (- + (- |currentTime| |$oldElapsedTime|) |gcDelta|)) |$timerTicksPerSecond|)) @@ -549,7 +549,7 @@ (PROGN (setq |currentElapsedSpace| (HEAPELAPSED)) (setq |elapsedBytes| - (SPADDIFFERENCE |currentElapsedSpace| + (- |currentElapsedSpace| |$oldElapsedSpace|)) (setq |$oldElapsedSpace| |currentElapsedSpace|) |elapsedBytes|)))) diff --git a/src/interp/g-util.lisp.pamphlet b/src/interp/g-util.lisp.pamphlet index c468252..455a4c5 100644 --- a/src/interp/g-util.lisp.pamphlet +++ b/src/interp/g-util.lisp.pamphlet @@ -268,7 +268,7 @@ (COND ((>= |wid| |width|) |text|) ('T - (setq |f| (DIVIDE (SPADDIFFERENCE |width| |wid|) 2)) + (setq |f| (DIVIDE (- |width| |wid|) 2)) (setq |fill1| '||) (DO ((G1407 (ELT |f| 0)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G1407) NIL) @@ -598,7 +598,7 @@ (COND ((QSLESSP |n| 3) (RETURN |p|))) (setq |l| (QSQUOTIENT |n| 2)) (setq |t| |p|) - (DO ((G1411 (SPADDIFFERENCE |l| 1)) + (DO ((G1411 (- |l| 1)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G1411) NIL) (SEQ (EXIT (setq |t| (QCDR |t|))))) @@ -978,7 +978,7 @@ ; posn(x,rest l,n+1) (DEFUN |position,posn| (|x| |l| |n|) - (SEQ (IF (NULL |l|) (EXIT (SPADDIFFERENCE 1))) + (SEQ (IF (NULL |l|) (EXIT (- 1))) (IF (BOOT-EQUAL |x| (CAR |l|)) (EXIT |n|)) (EXIT (|position,posn| |x| (CDR |l|) (+ |n| 1))))) @@ -1062,7 +1062,7 @@ (COND ((MINUSP |k|) |s|) ((BOOT-EQUAL (ELT |s| |k|) |$blank|) - (DO ((G1423 (SPADDIFFERENCE 1)) + (DO ((G1423 (- 1)) (|i| |k| (+ |i| G1423))) ((OR (IF (MINUSP G1423) (< |i| 0) (> |i| 0)) (NULL (BOOT-EQUAL (ELT |s| |i|) |$blank|))) diff --git a/src/interp/hashcode.lisp.pamphlet b/src/interp/hashcode.lisp.pamphlet index 61eaa9b..1bfcc0f 100644 --- a/src/interp/hashcode.lisp.pamphlet +++ b/src/interp/hashcode.lisp.pamphlet @@ -188,7 +188,7 @@ (RETURN (SEQ (PROGN (setq |h| 0) - (DO ((G166163 (SPADDIFFERENCE (|#| |str|) 1)) + (DO ((G166163 (- (|#| |str|) 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166163) NIL) (SEQ (EXIT (PROGN diff --git a/src/interp/i-analy.lisp.pamphlet b/src/interp/i-analy.lisp.pamphlet index 55ee03f..1ac5a5a 100644 --- a/src/interp/i-analy.lisp.pamphlet +++ b/src/interp/i-analy.lisp.pamphlet @@ -616,7 +616,7 @@ (PROG (G166400) (setq G166400 NIL) (RETURN - (DO ((G166405 (SPADDIFFERENCE |n| 1)) + (DO ((G166405 (- |n| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166405) (NREVERSE0 G166400)) @@ -654,7 +654,7 @@ (+ 1 (ELT |sameAsTarg| |i|)))))))))))) (setq |ok| NIL) - (DO ((G166433 (SPADDIFFERENCE |n| 1)) + (DO ((G166433 (- |n| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166433) NIL) (SEQ (EXIT (COND @@ -2078,7 +2078,7 @@ (CONS |nArgs| (CONS |nAllExposedMmsWithName| (CONS - (SPADDIFFERENCE |nAllMmsWithName| + (- |nAllMmsWithName| |nAllExposedMmsWithName|) NIL)))))) ((EQL |nAllExposedMmsWithNameAndArgs| 0) @@ -2091,7 +2091,7 @@ operations.") (CONS |opName| (CONS |nArgs| - (CONS (SPADDIFFERENCE + (CONS (- |nAllMmsWithNameAndArgs| |nAllExposedMmsWithNameAndArgs|) NIL))))) @@ -2109,7 +2109,7 @@ (CONS |nArgs| (CONS |nAllExposedMmsWithNameAndArgs| (CONS - (SPADDIFFERENCE + (- |nAllMmsWithNameAndArgs| |nAllExposedMmsWithNameAndArgs|) NIL))))))))) @@ -2180,7 +2180,7 @@ (setq |argl| (CDR |tree|)) (COND ((NULL |argl|) - (setq |val| (|fetchOutput| (SPADDIFFERENCE 1))) + (setq |val| (|fetchOutput| (- 1))) (|putValue| |op| |val|) (|putModeSet| |op| (CONS (|objMode| |val|) NIL))) ((AND (CONSP |argl|) (EQ (QCDR |argl|) NIL) diff --git a/src/interp/i-coerce.lisp.pamphlet b/src/interp/i-coerce.lisp.pamphlet index a80a9c2..10281ef 100644 --- a/src/interp/i-coerce.lisp.pamphlet +++ b/src/interp/i-coerce.lisp.pamphlet @@ -267,7 +267,7 @@ The special routines that do the coercions typically involve a "2" (setq |var| (QCAR |ISTMP#1|)) 'T)))) (|coerceInt| - (mkObjWrap (ELT |var| (SPADDIFFERENCE |val'| 1)) + (mkObjWrap (ELT |var| (- |val'| 1)) |$Symbol|) '(|Polynomial| (|Integer|)))) ((AND (CONSP |type|) (EQ (QCAR |type|) '|Polynomial|) @@ -3265,7 +3265,7 @@ Interpreter Coercion Query Functions (setq |doms| (|stripUnionTags| |doms|)) (setq |p| (|position| (|objMode| |object|) |doms|)) (COND - ((BOOT-EQUAL |p| (SPADDIFFERENCE 1)) + ((BOOT-EQUAL |p| (- 1)) (|keyedSystemError| "The type %1p is not branch of %2p" (CONS (|objMode| |object|) (CONS |union| NIL)))) ('T (setq |val| (|objVal| |object|)) @@ -3952,7 +3952,7 @@ Interpreter Coercion Query Functions (SEQ (IF (> |start| |i|) (EXIT |i|)) - (EXIT (SPADDIFFERENCE |i| 1))) + (EXIT (- |i| 1))) G168121))))))) |start| |len|)))))) @@ -3981,7 +3981,7 @@ Interpreter Coercion Query Functions (CONS (|position| |d1| |tl2|) G168143)))))))) (COND - ((|member| (SPADDIFFERENCE 1) |p2|) NIL) + ((|member| (- 1) |p2|) NIL) ('T (setq |p2'| (MSORT |p2|)) (COND ((BOOT-EQUAL |p2| |p2'|) NIL) @@ -3993,7 +3993,7 @@ Interpreter Coercion Query Functions |p2| 0 (|#| (REMDUP |tl1|))))) (setq |perms| (|permuteToOrder| |p2| - (SPADDIFFERENCE |n1| 1) 0)) + (- |n1| 1) 0)) (setq |towers| (CONS |tl1| NIL)) (setq |tower| (LIST2VEC |tl1|)) (DO ((G168161 |perms| (CDR G168161)) @@ -4102,7 +4102,7 @@ Interpreter Coercion Query Functions (PROG (|r| |x| |perms| |t| |stpos|) (RETURN (SEQ (PROGN - (setq |r| (SPADDIFFERENCE |n| |start|)) + (setq |r| (- |n| |start|)) (COND ((<= |r| 0) NIL) ((EQL |r| 1) @@ -4121,7 +4121,7 @@ Interpreter Coercion Query Functions (setq |perms| NIL) (DO () ((NULL (NEQUAL |stpos| |start|)) NIL) (SEQ (EXIT (PROGN - (setq |x| (SPADDIFFERENCE |stpos| 1)) + (setq |x| (- |stpos| 1)) (setq |perms| (CONS (CONS |x| |stpos|) |perms|)) diff --git a/src/interp/i-coerfn.lisp.pamphlet b/src/interp/i-coerfn.lisp.pamphlet index 07043d0..4a18cda 100755 --- a/src/interp/i-coerfn.lisp.pamphlet +++ b/src/interp/i-coerfn.lisp.pamphlet @@ -677,7 +677,7 @@ all these coercion functions have the following result: (|getFunctionFromDomain| '+ |target| (CONS |target| (CONS |target| NIL)))) (setq |u''| (|genMpFromDmpTerm| (ELT |u'| 0) 0)) - (DO ((G166590 (SPADDIFFERENCE (|#| |u'|) 1)) + (DO ((G166590 (- (|#| |u'|) 1)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166590) NIL) (SEQ (EXIT (setq |u''| @@ -746,7 +746,7 @@ all these coercion functions have the following result: (RETURN (SEQ (PROGN (setq |vl'| (REVERSE (MSORT |vl|))) - (setq |n| (+ (SPADDIFFERENCE 1) (|#| |vl|))) + (setq |n| (+ (- 1) (|#| |vl|))) (setq |pos| (LIST2VEC (|LZeros| (+ |n| 1)))) (DO ((|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| |n|) NIL) (SEQ (EXIT (SETELT |pos| |i| @@ -1019,7 +1019,7 @@ all these coercion functions have the following result: (setq |termlist| (QCDR |ISTMP#1|)) 'T)))) (CONS 1 - (CONS (ELT |vl| (SPADDIFFERENCE |v| 1)) + (CONS (ELT |vl| (- |v| 1)) (PROG (G166857) (setq G166857 NIL) (RETURN @@ -1133,7 +1133,7 @@ all these coercion functions have the following result: (RETURN (DO ((G166957 NIL (NULL G166951)) (G166958 - (+ (SPADDIFFERENCE 1) (|#| |vl|))) + (+ (- 1) (|#| |vl|))) (|i| 0 (QSADD1 |i|))) ((OR G166957 (QSGREATERP |i| G166958)) G166951) @@ -1280,7 +1280,7 @@ all these coercion functions have the following result: ((EQL |pos| 0) (CDR |l|)) ('T (CONS (CAR |l|) - (|removeListElt| (CDR |l|) (SPADDIFFERENCE |pos| 1)))))) + (|removeListElt| (CDR |l|) (- |pos| 1)))))) ;NDmp2domain(u,source is [ndmp,x,S],target) == ; -- a null NDMP = 0 @@ -1980,7 +1980,7 @@ all these coercion functions have the following result: ('T (setq E (|defaultTargetFE| |source|)) (setq |negOne| (|coerceInt| - (mkObjWrap (SPADDIFFERENCE 1) |$Integer|) E)) + (mkObjWrap (- 1) |$Integer|) E)) (COND ((NULL |negOne|) (|coercionFailure|)) ('T @@ -2552,12 +2552,12 @@ all these coercion functions have the following result: ((BOOT-EQUAL |x| '|$fromCoerceable$|) (|canCoerce| R S)) ('T (setq |n| (|#| |x|)) (setq |m| (|#| (ELT |x| 0))) (setq |v| NIL) - (DO ((G168072 (SPADDIFFERENCE |n| 1)) + (DO ((G168072 (- |n| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G168072) NIL) (SEQ (EXIT (PROGN (setq |u| NIL) - (DO ((G168082 (SPADDIFFERENCE |m| 1)) + (DO ((G168082 (- |m| 1)) (|j| 0 (QSADD1 |j|))) ((QSGREATERP |j| G168082) NIL) (SEQ (EXIT @@ -2749,7 +2749,7 @@ all these coercion functions have the following result: NIL) (SEQ (EXIT (PROGN (setq |e'| (LIST2VEC (|LZeros| |n|))) - (SETELT |e'| (SPADDIFFERENCE |x| 1) |e|) + (SETELT |e'| (- |x| 1) |e|) (setq |t| (CONS (CONS |e'| |one|) NIL)) (setq |t| (SPADCALL |t| @@ -3024,11 +3024,11 @@ all these coercion functions have the following result: (OR (|coerceInt| (mkObjWrap (ELT |vars| - (SPADDIFFERENCE |var| 1)) + (- |var| 1)) (CONS '|Variable| (CONS (ELT |vars| - (SPADDIFFERENCE |var| 1)) + (- |var| 1)) NIL))) (CONS |mp| (CONS |vars| @@ -3102,7 +3102,7 @@ all these coercion functions have the following result: |varl1| |varl2| |plus| |monom|) (|position1| (ELT |varl1| - (SPADDIFFERENCE |var| 1)) + (- |var| 1)) |varl2|) |e| |monom|)) (setq |sum| @@ -3276,7 +3276,7 @@ all these coercion functions have the following result: (COND ((>= |patlen| |numexps|) (CONS 0 |c|)) ('T - (DO ((G168566 (SPADDIFFERENCE |numexps| 1)) + (DO ((G168566 (- |numexps| 1)) (|i| |patlen| (+ |i| 1))) ((> |i| G168566) NIL) (SEQ (EXIT (COND @@ -3390,7 +3390,7 @@ all these coercion functions have the following result: G168635)))))))) (setq |p| (SPADCALL |sup| - (ELT |vl| (SPADDIFFERENCE |pos| 1)) + (ELT |vl| (- |pos| 1)) |multivariate|))))))))) ; --(p' :=coerceInt(objNewWrap(p,PS),['Polynomial,R])) or coercionFailure() @@ -3528,7 +3528,7 @@ all these coercion functions have the following result: (COND ((BOOT-EQUAL |u| '|$fromCoerceable$|) 'T) ('T - (|position1| (ELT |svl| (SPADDIFFERENCE |u| 1)) |tvl|)))) + (|position1| (ELT |svl| (- |u| 1)) |tvl|)))) ((BOOT-EQUAL |u| '|$fromCoerceable$|) NIL) ('T (|coercionFailure|))))))) @@ -3546,7 +3546,7 @@ all these coercion functions have the following result: (COND ((BOOT-EQUAL |u| '|$fromCoerceable$|) 'T) ('T - (setq |v| (ELT |svl| (SPADDIFFERENCE (|unwrap| |u|) 1))) + (setq |v| (ELT |svl| (- (|unwrap| |u|) 1))) (CONS 1 (CONS |v| (CONS (CONS 1 (CONS 0 (|domainOne| T$))) NIL))))))))) @@ -3596,7 +3596,7 @@ all these coercion functions have the following result: (|member| |v| |vl|))))))))))) ('T (setq |v| - (ELT |svl| (SPADDIFFERENCE (|unwrap| |u|) 1))) + (ELT |svl| (- (|unwrap| |u|) 1))) (setq |val'| (CONS 1 (|domainOne| T$))) (COND ((BOOT-EQUAL |p| '|UnivariatePolynomial|) @@ -3629,7 +3629,7 @@ all these coercion functions have the following result: (setq |svl| (CADR |source|)) (COND ((BOOT-EQUAL |u| '|$fromCoerceable$|) 'T) - ('T (ELT |svl| (SPADDIFFERENCE (|unwrap| |u|) 1)))))))) + ('T (ELT |svl| (- (|unwrap| |u|) 1)))))))) ;OV2Sy(u,source is [.,svl], target) == ; u = '_$fromCoerceable_$ => true @@ -3643,7 +3643,7 @@ all these coercion functions have the following result: (setq |svl| (CADR |source|)) (COND ((BOOT-EQUAL |u| '|$fromCoerceable$|) 'T) - ('T (ELT |svl| (SPADDIFFERENCE (|unwrap| |u|) 1)))))))) + ('T (ELT |svl| (- (|unwrap| |u|) 1)))))))) ;--% Polynomial ;varsInPoly(u) == @@ -4618,11 +4618,11 @@ all these coercion functions have the following result: ((ATOM |vl|) (setq |vl'| (CONS |vl| NIL))) ('T (setq |vl'| |vl|))) (setq |novars| 'T) - (DO ((G169670 (SPADDIFFERENCE |n| 1)) + (DO ((G169670 (- |n| 1)) (|i| 0 (QSADD1 |i|))) ((OR (QSGREATERP |i| G169670) (NULL |novars|)) NIL) - (SEQ (EXIT (DO ((G169681 (SPADDIFFERENCE |n| 1)) + (SEQ (EXIT (DO ((G169681 (- |n| 1)) (|j| 0 (QSADD1 |j|))) ((OR (QSGREATERP |j| G169681) (NULL |novars|)) @@ -4746,7 +4746,7 @@ all these coercion functions have the following result: (|canCoerce| |source| S)) ('T (setq |len| (|#| |vl|)) (COND - ((NEQUAL (SPADDIFFERENCE 1) + ((NEQUAL (- 1) (setq |n| (|position| |u| |vl|))) (setq |u| (|wrap| (LIST @@ -4757,7 +4757,7 @@ all these coercion functions have the following result: (RETURN (DO ((G169797 - (SPADDIFFERENCE |len| 1)) + (- |len| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G169797) (NREVERSE0 G169792)) @@ -4832,7 +4832,7 @@ all these coercion functions have the following result: (|canCoerce| |source| S)) ('T (setq |len| (|#| |vl|)) (COND - ((NEQUAL (SPADDIFFERENCE 1) + ((NEQUAL (- 1) (setq |n| (|position| |u| |vl|))) (setq |u| (|wrap| (LIST @@ -4843,7 +4843,7 @@ all these coercion functions have the following result: (RETURN (DO ((G169853 - (SPADDIFFERENCE |len| 1)) + (- |len| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G169853) (NREVERSE0 G169848)) @@ -5019,12 +5019,12 @@ all these coercion functions have the following result: (CONS 0 G169969))))))))) (setq |l2| (AND (NULL (BOOT-EQUAL |p| - (SPADDIFFERENCE |n| 1))) + (- |n| 1))) (PROG (G169981) (setq G169981 NIL) (RETURN (DO ((G169986 - (SPADDIFFERENCE |n| 2)) + (- |n| 2)) (|m| |p| (+ |m| 1))) ((> |m| G169986) (NREVERSE0 G169981)) @@ -5167,12 +5167,12 @@ all these coercion functions have the following result: (setq |coef| (COND ((EQL - (SPADDIFFERENCE |e1| |e2|) + (- |e1| |e2|) 1) |sym|) ('T (SPADCALL |sym| - (SPADDIFFERENCE |e1| |e2|) + (- |e1| |e2|) |expn|)))) (COND ((NULL (BOOT-EQUAL S |target|)) @@ -5587,7 +5587,7 @@ all these coercion functions have the following result: (OR (|member| |sym| |vl|) (|canCoerce| |source| S))) ('T (setq |len| (|#| |vl|)) (COND - ((NEQUAL (SPADDIFFERENCE 1) + ((NEQUAL (- 1) (setq |n| (|position| |sym| |vl|))) (LIST (CONS (LIST2VEC (PROG (G170521) @@ -5595,7 +5595,7 @@ all these coercion functions have the following result: (RETURN (DO ((G170526 - (SPADDIFFERENCE |len| 1)) + (- |len| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G170526) (NREVERSE0 G170521)) @@ -5639,7 +5639,7 @@ all these coercion functions have the following result: (OR (|member| |sym| |vl|) (|canCoerce| |source| S))) ('T (setq |len| (|#| |vl|)) (COND - ((NEQUAL (SPADDIFFERENCE 1) + ((NEQUAL (- 1) (setq |n| (|position| |sym| |vl|))) (LIST (CONS (LIST2VEC (PROG (G170557) @@ -5647,7 +5647,7 @@ all these coercion functions have the following result: (RETURN (DO ((G170562 - (SPADDIFFERENCE |len| 1)) + (- |len| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G170562) (NREVERSE0 G170557)) @@ -5724,7 +5724,7 @@ all these coercion functions have the following result: (OR (|member| |sym| |vl|) (|canCoerce| |source| S))) ('T (setq |len| (|#| |vl|)) (COND - ((NEQUAL (SPADDIFFERENCE 1) + ((NEQUAL (- 1) (setq |n| (|position| |u| |vl|))) (LIST (CONS (LIST2VEC (PROG (G170613) @@ -5732,7 +5732,7 @@ all these coercion functions have the following result: (RETURN (DO ((G170618 - (SPADDIFFERENCE |len| 1)) + (- |len| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G170618) (NREVERSE0 G170613)) @@ -6055,8 +6055,8 @@ all these coercion functions have the following result: (setq |ISTMP#1| (QCDR D)) (AND (CONSP |ISTMP#1|) (PROGN (setq E (QCAR |ISTMP#1|)) 'T))) - (|isRectangularVector| |u| (SPADDIFFERENCE |n| 1) - (SPADDIFFERENCE |m| 1))) + (|isRectangularVector| |u| (- |n| 1) + (- |m| 1))) (LIST2VEC (PROG (G170864) (setq G170864 NIL) @@ -6115,8 +6115,8 @@ all these coercion functions have the following result: (setq |ISTMP#1| (QCDR D)) (AND (CONSP |ISTMP#1|) (PROGN (setq E (QCAR |ISTMP#1|)) 'T))) - (|isRectangularVector| |u| (SPADDIFFERENCE |n| 1) - (SPADDIFFERENCE |n| 1))) + (|isRectangularVector| |u| (- |n| 1) + (- |n| 1))) (LIST2VEC (PROG (G170934) (setq G170934 NIL) @@ -6570,10 +6570,10 @@ all these coercion functions have the following result: (setq |n| (CADR |source|)) (setq |S'| (CONS |sm| (CONS |n| (CONS |$Integer| NIL)))) - (DO ((G171156 (SPADDIFFERENCE |n| 1)) + (DO ((G171156 (- |n| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G171156) NIL) - (SEQ (EXIT (DO ((G171163 (SPADDIFFERENCE |n| 1)) + (SEQ (EXIT (DO ((G171163 (- |n| 1)) (|j| 0 (QSADD1 |j|))) ((QSGREATERP |j| G171163) NIL) (SEQ (EXIT (COND @@ -6626,7 +6626,7 @@ all these coercion functions have the following result: (PROG (G171188) (setq G171188 NIL) (RETURN - (DO ((G171193 (SPADDIFFERENCE |dim| 1)) + (DO ((G171193 (- |dim| 1)) (|r| 0 (QSADD1 |r|))) ((QSGREATERP |r| G171193) (NREVERSE0 G171188)) @@ -6638,7 +6638,7 @@ all these coercion functions have the following result: (RETURN (DO ((G171206 - (SPADDIFFERENCE |dim| 1)) + (- |dim| 1)) (|c| 0 (QSADD1 |c|))) ((QSGREATERP |c| G171206) diff --git a/src/interp/i-eval.lisp.pamphlet b/src/interp/i-eval.lisp.pamphlet index 69d5d59..3199c13 100644 --- a/src/interp/i-eval.lisp.pamphlet +++ b/src/interp/i-eval.lisp.pamphlet @@ -555,7 +555,7 @@ (COND ((AND (NEQUAL |opName| (QUOTE |setelt|)) (NEQUAL - (ELT |opString| (SPADDIFFERENCE (|#| |opString|) 1)) + (ELT |opString| (- (|#| |opString|) 1)) (|char| (QUOTE !)))) NIL) ((QUOTE T) (setq |dc| (CAR |sig|)) (BOOT-EQUAL |t| |dc|))))))) @@ -778,7 +778,7 @@ ((NULL |$compilingMap|) (setq |n| (QUOTE |unknownVar|))) ((QUOTE T) (setq |alias| (|get| |$mapName| (QUOTE |alias|) |$e|)) - (setq |n| (ELT |alias| (SPADDIFFERENCE |num| 1))))))) + (setq |n| (ELT |alias| (- |num| 1))))))) (|keyedMsgCompFailure| (format nil "Your expression cannot be fully compiled because it contains an ~ diff --git a/src/interp/i-funsel.lisp.pamphlet b/src/interp/i-funsel.lisp.pamphlet index 66485b5..fa5b442 100644 --- a/src/interp/i-funsel.lisp.pamphlet +++ b/src/interp/i-funsel.lisp.pamphlet @@ -1791,7 +1791,7 @@ (setq |v| (|argCouldBelongToSubdomain| |opname| |nargs|)) (setq |mss| NIL) - (DO ((G166875 (SPADDIFFERENCE |nargs| 1)) + (DO ((G166875 (- |nargs| 1)) (|i| 0 (QSADD1 |i|)) (G166876 |args| (CDR G166876)) (|x| NIL)) ((OR (QSGREATERP |i| G166875) (ATOM G166876) @@ -1840,7 +1840,7 @@ (|getModemapsFromDatabase| |op| |nargs|)) (COND ((NULL |mms|) |v|) - (t (setq |nargs| (SPADDIFFERENCE |nargs| 1)) + (t (setq |nargs| (- |nargs| 1)) (SEQ (DO ((G166914 |mms| (CDR G166914)) (G166905 NIL)) ((OR (ATOM G166914) @@ -2128,9 +2128,9 @@ the types A and B themselves are not sorted by preference. (setq |res| (CADR |sig|)) (COND ((BOOT-EQUAL |res| |$PositiveInteger|) - (SPADDIFFERENCE |cost| 2)) + (- |cost| 2)) ((BOOT-EQUAL |res| |$NonNegativeInteger|) - (SPADDIFFERENCE |cost| 1)) + (- |cost| 1)) ((BOOT-EQUAL |res| |$DoubleFloat|) (+ |cost| 1)) (t (COND @@ -2631,7 +2631,7 @@ the types A and B themselves are not sorted by preference. ((> |min| (setq |met| (ABS - (SPADDIFFERENCE |sz| 3)))) + (- |sz| 3)))) (setq |min| |met|) (setq |fsz| |sz|)) (t NIL)))))) @@ -3083,7 +3083,7 @@ the types A and B themselves are not sorted by preference. (setq |LETTMP#1| (FUNCALL |makeFunc| '$ |dc| |$CategoryFrame|)) (setq |funlist| (CAR |LETTMP#1|)) - (setq |maxargs| (SPADDIFFERENCE 1)) + (setq |maxargs| (- 1)) (setq |impls| NIL) (DO ((G167553 |funlist| (CDR G167553)) (G167537 NIL)) @@ -3129,7 +3129,7 @@ the types A and B themselves are not sorted by preference. |impls|))))))) (setq |impls| (NREVERSE |impls|)) (COND - ((NEQUAL |maxargs| (SPADDIFFERENCE 1)) + ((NEQUAL |maxargs| (- 1)) (setq SL NIL) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |maxargs|) NIL) diff --git a/src/interp/i-map.lisp.pamphlet b/src/interp/i-map.lisp.pamphlet index 944cd1c..63b2a0f 100644 --- a/src/interp/i-map.lisp.pamphlet +++ b/src/interp/i-map.lisp.pamphlet @@ -862,7 +862,7 @@ (AND (CONSP |ISTMP#1|) (EQ (QCDR |ISTMP#1|) NIL) (PROGN (setq |n| (QCAR |ISTMP#1|)) 'T))) (NUMBERP |n|)) - (SPADDIFFERENCE |n|)) + (- |n|)) ('T (CONS (|removeZeroOne| (CAR |x|)) (|removeZeroOne| (CDR |x|)))))))) @@ -2576,7 +2576,7 @@ (|untraceMapSubNames| (CONS (CADAR |currentMms|) NIL)))) (setq |newName| (|makeInternalMapName| |op| - (SPADDIFFERENCE (|#| |sig|) 1) + (- (|#| |sig|) 1) (+ 1 (|#| |currentMms|)) NIL)) (setq |newMm| (CONS (CONS '|local| |sig|) diff --git a/src/interp/i-output.lisp.pamphlet b/src/interp/i-output.lisp.pamphlet index 2c54962..2dbe5b8 100644 --- a/src/interp/i-output.lisp.pamphlet +++ b/src/interp/i-output.lisp.pamphlet @@ -786,7 +786,7 @@ these functions return an updated ``layout so far'' in general (COND ((MINUSP |b|) (CONS '+ - (CONS |a| (CONS (SPADDIFFERENCE |b|) NIL)))) + (CONS |a| (CONS (- |b|) NIL)))) ('T (CONS '+ (CONS |a| @@ -2009,7 +2009,7 @@ NIL (RETURN (SEQ (PROGN (setq |l| (CDR G167610)) - (SPADDIFFERENCE + (- (PROG (G167617) (setq G167617 0) (RETURN @@ -2049,7 +2049,7 @@ NIL (|subspan| |b|)) (COND ((EQL 0 (|superspan| |a|)) 0) - ('T (SPADDIFFERENCE 1))))) + ('T (- 1))))) (APP |b| |x'| |y'| |d|))))) ;exptNeedsPren a == @@ -2088,7 +2088,7 @@ NIL (+ (+ (|superspan| |a|) (|height| |b|)) (COND ((EQL (|superspan| |a|) 0) 0) - ('T (SPADDIFFERENCE 1)))))))) + ('T (- 1)))))))) ;exptWidth [.,a,b] == WIDTH a+WIDTH b+(exptNeedsPren a => 2;0) @@ -2413,7 +2413,7 @@ NIL (setq |op| |a|))) (COND ((BOOT-EQUAL |op| 'SLASH) - (SPADDIFFERENCE + (- (|getBindingPowerOf| |key| (CONS '/ |argl|)) 1)) ((BOOT-EQUAL |op| 'OVER) (|getBindingPowerOf| |key| (CONS '/ |argl|))) @@ -3187,8 +3187,8 @@ NIL PAREN BRACKET BRACE)) - (setq |dist| (SPADDIFFERENCE |dist| 3)) - (setq |width| (SPADDIFFERENCE |width| 3)) + (setq |dist| (- |dist| 3)) + (setq |width| (- |width| 3)) (setq |ans| (DO ((G168272 (CDR |u|) (CDR G168272)) (|v| NIL)) @@ -3205,7 +3205,7 @@ NIL (|largeMatrixAlist| |ans|))) ('T (setq |dist| - (SPADDIFFERENCE |dist| + (- |dist| (WIDTH |v|))) (COND ((MINUSP |dist|) @@ -3215,10 +3215,10 @@ NIL (COND ((setq |ans| (|LargeMatrixp| (CADR |u|) - (SPADDIFFERENCE |width| 3) |dist|)) + (- |width| 3) |dist|)) (|largeMatrixAlist| |ans|)) ('T (setq |n| (+ 3 (WIDTH (CADR |u|)))) - (setq |dist| (SPADDIFFERENCE |dist| |n|)) + (setq |dist| (- |dist| |n|)) (setq |ans| (DO ((G168281 (CDDR |u|) (CDR G168281)) (|v| NIL)) @@ -3236,7 +3236,7 @@ NIL (|largeMatrixAlist| |ans|))) ('T (setq |dist| - (SPADDIFFERENCE |dist| + (- |dist| (WIDTH |v|))) (COND ((MINUSP |dist|) @@ -3259,7 +3259,7 @@ NIL (|largeMatrixAlist| |ans|))) ('T (setq |dist| - (SPADDIFFERENCE |dist| + (- |dist| (WIDTH |v|))) (COND ((MINUSP |dist|) @@ -3552,22 +3552,22 @@ NIL (setq |opWidth| (COND ((BOOT-EQUAL |kind| '|pi|) 5) ('T 3))) (setq |maxWidth| (MAX |opWidth| |botWidth| |topWidth|)) (setq |xCenter| - (+ (QUOTIENT (SPADDIFFERENCE |maxWidth| 1) 2) |x|)) + (+ (QUOTIENT (- |maxWidth| 1) 2) |x|)) (setq |d| (APP |arg| (+ (+ |x| 2) |maxWidth|) |y| |d|)) (setq |d| (COND ((AND (ATOM |bot|) (EQL (SIZE (|atom2String| |bot|)) 1)) - (APP |bot| |xCenter| (SPADDIFFERENCE |y| 2) |d|)) + (APP |bot| |xCenter| (- |y| 2) |d|)) ('T (APP |bot| (+ |x| (QUOTIENT - (SPADDIFFERENCE |maxWidth| + (- |maxWidth| |botWidth|) 2)) - (SPADDIFFERENCE (SPADDIFFERENCE |y| 2) + (- (- |y| 2) (|superspan| |bot|)) |d|)))) (COND @@ -3580,7 +3580,7 @@ NIL (APP |top| (+ |x| (QUOTIENT - (SPADDIFFERENCE |maxWidth| + (- |maxWidth| |topWidth|) 2)) (+ (+ |y| 2) (|subspan| |top|)) @@ -3631,7 +3631,7 @@ NIL (|specialChar| '|urc|)) NIL)))))))))) ('T (THROW '|outputFailure| '|outputFailure|)))) - (|xLate| |opCode| (SPADDIFFERENCE |xCenter| |delta|) |y| |d|))))) + (|xLate| |opCode| (- |xCenter| |delta|) |y| |d|))))) ;sigmaWidth [.,bot,arg] == bigopWidth(bot,nil,arg,'sigma) @@ -3787,11 +3787,11 @@ NIL (setq |a| (CADR G168638)) (setq |b| (CADDR G168638)) (setq |underApp| (APP |b| |x| |y| |d|)) - (setq |endPoint| (SPADDIFFERENCE (+ |x| (WIDTH |b|)) 1)) + (setq |endPoint| (- (+ |x| (WIDTH |b|)) 1)) (setq |middle| (QUOTIENT (+ |x| |endPoint|) 2)) (setq |h| (+ (+ |y| (|superspan| |b|)) 1)) (setq |d| (APP |a| |middle| (+ |h| 1) |d|)) - (|apphor| |x| (SPADDIFFERENCE (+ |x| (WIDTH |b|)) 1) + (|apphor| |x| (- (+ |x| (WIDTH |b|)) 1) (+ (+ |y| (|superspan| |b|)) 1) |d| '|\||))))) ;overbarSuper u == 1 + superspan u.1 @@ -3811,7 +3811,7 @@ NIL (RETURN (PROGN (setq |underApp| (APP (ELT |u| 1) |x| |y| |d|)) - (|apphor| |x| (SPADDIFFERENCE (+ |x| (WIDTH (ELT |u| 1))) 1) + (|apphor| |x| (- (+ |x| (WIDTH (ELT |u| 1))) 1) (+ (+ |y| (|superspan| (ELT |u| 1))) 1) |d| UNDERBAR))))) ;indefIntegralSub u == @@ -3904,13 +3904,13 @@ NIL (setq |d| (APP |arg| (+ (+ |x| 4) - (MAX (+ (SPADDIFFERENCE 4) + (MAX (+ (- 4) (WIDTH |bot|)) (WIDTH |top|))) |y| |d|)) (setq |d| (APP |bot| |x| - (SPADDIFFERENCE (SPADDIFFERENCE |y| 2) + (- (- |y| 2) (|superspan| |bot|)) |d|)) (setq |d| @@ -3937,7 +3937,7 @@ NIL (COND ((QSLESSP (|#| |u|) 4) (THROW '|outputFailure| '|outputFailure|)) ('T - (+ (+ (MAX (+ (SPADDIFFERENCE 4) (WIDTH (ELT |u| 1))) + (+ (+ (MAX (+ (- 4) (WIDTH (ELT |u| 1))) (WIDTH (ELT |u| 2))) (WIDTH (ELT |u| 3))) 5)))) @@ -4021,7 +4021,7 @@ NIL (|charybdis| (|concatTrouble,fixUp| |y|) (+ |start| 2) - (SPADDIFFERENCE |lineLength| 2))) + (- |lineLength| 2))) ('T (|charybdis| (|concatTrouble,fixUp| |y|) @@ -4057,7 +4057,7 @@ NIL (setq |maxW| (COND (|firstTimeIfTrue| |maxWidth|) - ('T (SPADDIFFERENCE |maxWidth| 2)))) + ('T (- |maxWidth| 2)))) (COND ((> 1 |maxW|) (PROG (G168783) @@ -4366,14 +4366,14 @@ NIL (COND ((> |start| 1) (setq |blnks| - (|fillerSpaces| (SPADDIFFERENCE |start| 1) + (|fillerSpaces| (- |start| 1) " "))) ('T (setq |blnks| ""))) (setq |under| "_") (setq |firsttime| (> |linelength| 3)) (COND ((> |linelength| 2) - (setq |linelength| (SPADDIFFERENCE |linelength| 1)))) + (setq |linelength| (- |linelength| 1)))) (DO () ((NULL (> (SIZE |num|) |linelength|)) NIL) (SEQ (EXIT (PROGN (COND @@ -4399,7 +4399,7 @@ NIL (CONCAT |blnks| " ")) (setq |linelength| - (SPADDIFFERENCE |linelength| + (- |linelength| 1)) (setq |firsttime| NIL)) ('T NIL)))))) @@ -4433,7 +4433,7 @@ NIL (COND ((> |start| 1) (setq |blnks| - (|fillerSpaces| (SPADDIFFERENCE |start| 1) + (|fillerSpaces| (- |start| 1) " "))) ('T (setq |blnks| ""))) (DO () ((NULL (> (SIZE |str|) |linelength|)) NIL) @@ -4811,7 +4811,7 @@ NIL (PROGN (setq |m| (NREVERSE |m|)) 'T)))) (|charyTop| (CONS 'CONCATB |m|) |start| |linelength|) (|charyTop| (CONS 'SC |l|) (+ |start| 2) - (SPADDIFFERENCE |linelength| 2))) + (- |linelength| 2))) ((AND (CONSP |u|) (EQ (QCAR |u|) 'CENTER) (PROGN (setq |ISTMP#1| (QCDR |u|)) @@ -4820,13 +4820,13 @@ NIL (setq |b| (|charyTopWidth| |a|)) (COND ((> (setq |w| (WIDTH |b|)) - (SPADDIFFERENCE |linelength| |start|)) + (- |linelength| |start|)) (|charyTop| |a| |start| |linelength|)) ('T (|charyTop| |b| (QUOTIENT - (SPADDIFFERENCE - (SPADDIFFERENCE |linelength| |start|) |w|) + (- + (- |linelength| |start|) |w|) 2) |linelength|)))) ('T (setq |v| (|charyTopWidth| |u|)) @@ -4837,7 +4837,7 @@ NIL (|charyTrouble| |u| |v| |start| |linelength|)) ('T (setq |d| (APP |v| |start| 0 NIL)) (setq |n| (|superspan| |v|)) - (setq |m| (SPADDIFFERENCE (|subspan| |v|))) + (setq |m| (- (|subspan| |v|))) (COND (|$testOutputLineFlag| (setq |$testOutputLineList| @@ -4847,7 +4847,7 @@ NIL (DO ((G169142 NIL (> |m| |n|))) (G169142 NIL) (SEQ (EXIT (PROGN (|scylla| |n| |d|) - (setq |n| (SPADDIFFERENCE |n| 1)))))) + (setq |n| (- |n| 1)))))) " ")))))))))) ;charyTopWidth u == @@ -5020,7 +5020,7 @@ NIL (CONS 'CONCATB (CONS |loop| (CONS '|repeat| NIL))) |start| |linelength|) (|charyTop| |body| (+ |start| 2) - (SPADDIFFERENCE |linelength| 2))) + (- |linelength| 2))) ((AND (PROGN (setq |ISTMP#1| (CDR |v|)) (AND (CONSP |ISTMP#1|) @@ -5060,7 +5060,7 @@ NIL (CONS |wu| (CONS |loop| (CONS '|repeat| NIL)))) |start| |linelength|) (|charyTop| |body| (+ |start| 2) - (SPADDIFFERENCE |linelength| 2))) + (- |linelength| 2))) ('T (|concatTrouble| (CDR |v|) |d| |start| |linelength| 'T)))) ((GETL |x| 'INFIXOP) (|charySplit| |u| |v| |start| |linelength|)) @@ -5116,7 +5116,7 @@ NIL (PROGN (|charybdis| "-" |start| |linelength|) (|charybdis| (ELT |v| 1) (+ |start| 3) - (SPADDIFFERENCE |linelength| 3)) + (- |linelength| 3)) " ")) ;charyBinary(d,u,v,start,linelength) == @@ -5136,14 +5136,14 @@ NIL (|charybdis| (CONS 'CONCATB (CONS (ELT |v| 1) (CONS |d| NIL))) |start| |linelength|) (|charybdis| (ELT |v| 2) (+ |start| 2) - (SPADDIFFERENCE |linelength| 2)) + (- |linelength| 2)) " ") ('T (|charybdis| (ELT |v| 1) (+ |start| 2) - (SPADDIFFERENCE |linelength| 2)) + (- |linelength| 2)) (COND (|d| (|prnd| |start| |d|))) (|charybdis| (ELT |v| 2) (+ |start| 2) - (SPADDIFFERENCE |linelength| 2)) + (- |linelength| 2)) " "))) ;charyEquatnum(u,v,start,linelength) == @@ -5188,9 +5188,9 @@ NIL (setq |v| (CONS (CAR (ELT |v| 0)) (CDR |v|))) (setq |m| (CDR |v|)) (COND - ((> (WIDTH (ELT |v| 1)) (SPADDIFFERENCE |linelength| 2)) + ((> (WIDTH (ELT |v| 1)) (- |linelength| 2)) (|charybdis| (ELT |v| 1) (+ |start| 2) - (SPADDIFFERENCE |linelength| 2)) + (- |linelength| 2)) (COND ((NULL (CDDR |v|)) " ") ('T (setq |dm| (CDDR |v|)) @@ -5204,7 +5204,7 @@ NIL (RPLACD |dm| NIL) (COND ((> (WIDTH |v|) - (SPADDIFFERENCE |linelength| 2)) + (- |linelength| 2)) (RETURN NIL)) ('T (RPLAC (CAR |v|) (CAR (ELT |v| 0))) @@ -5212,7 +5212,7 @@ NIL (setq |m| (CDR |m|)))))))) (RPLAC (CAR |v|) (CAR (ELT |v| 0))) (RPLACD |m| NIL) (|charybdis| |v| (+ |start| 2) - (SPADDIFFERENCE |linelength| 2)) + (- |linelength| 2)) (|split2| |u| |dm| |ddm| |start| |linelength|)))))))) ;split2(u,dm,ddm,start,linelength) == @@ -5233,12 +5233,12 @@ NIL ('T ","))) (RPLACD |dm| |ddm|) (setq |m| - (> (SPADDIFFERENCE |linelength| 2) + (> (- |linelength| 2) (WIDTH (CONS (|keyp| |u|) |dm|)))) (|charybdis| (CONS (|keyp| |u|) |dm|) (COND (|m| (+ |start| 2)) ('T |start|)) (COND - (|m| (SPADDIFFERENCE |linelength| 2)) + (|m| (- |linelength| 2)) ('T |linelength|))) " ")))) @@ -5252,7 +5252,7 @@ NIL (DEFUN |charyElse| (|u| |v| |start| |linelength|) (PROGN (|charybdis| (ELT |v| 1) (+ |start| 3) - (SPADDIFFERENCE |linelength| 3)) + (- |linelength| 3)) (COND ((NULL (CDDR |u|)) " ") ('T (|prnd| |start| ",") @@ -5305,7 +5305,7 @@ NIL (DEFUN |absym| (|x|) (COND - ((AND (NUMBERP |x|) (MINUSP |x|)) (SPADDIFFERENCE |x|)) + ((AND (NUMBERP |x|) (MINUSP |x|)) (- |x|)) ((AND (NULL (ATOM |x|)) (BOOT-EQUAL (|keyp| |x|) '-)) (CADR |x|)) ('T |x|))) @@ -5316,7 +5316,7 @@ NIL (DEFUN |agg| (|n| |u|) (COND ((EQL |n| 1) (CADR |u|)) - ('T (|agg| (SPADDIFFERENCE |n| 1) (CDR |u|))))) + ('T (|agg| (- |n| 1) (CDR |u|))))) ;aggwidth u == ; null u => 0 @@ -5442,11 +5442,11 @@ NIL (DEFUN |apprpar| (|x| |y| |y1| |y2| |d|) (COND - ((OR (NULL *TALLPAR) (> 2 (SPADDIFFERENCE |y2| |y1|))) + ((OR (NULL *TALLPAR) (> 2 (- |y2| |y1|))) (APP ")" |x| |y| |d|)) ('T (APP ")" |x| |y2| - (|apprpar1| |x| |y| |y1| (SPADDIFFERENCE |y2| 1) |d|))))) + (|apprpar1| |x| |y| |y1| (- |y2| 1) |d|))))) ;apprpar1(x, y, y1, y2, d) == ; (y1 = y2) => APP('")", x, y2, d) @@ -5457,7 +5457,7 @@ NIL ((BOOT-EQUAL |y1| |y2|) (APP ")" |x| |y2| |d|)) ('T (APP ")" |x| |y2| - (|apprpar1| |x| |y| |y1| (SPADDIFFERENCE |y2| 1) |d|))))) + (|apprpar1| |x| |y| |y1| (- |y2| 1) |d|))))) ;applpar(x, y, y1, y2, d) == ; (^(_*TALLPAR) or (y2 - y1 < 2)) => APP('"(", x, y, d) @@ -5465,11 +5465,11 @@ NIL (DEFUN |applpar| (|x| |y| |y1| |y2| |d|) (COND - ((OR (NULL *TALLPAR) (> 2 (SPADDIFFERENCE |y2| |y1|))) + ((OR (NULL *TALLPAR) (> 2 (- |y2| |y1|))) (APP "(" |x| |y| |d|)) ('T (APP "(" |x| |y2| - (|applpar1| |x| |y| |y1| (SPADDIFFERENCE |y2| 1) |d|))))) + (|applpar1| |x| |y| |y1| (- |y2| 1) |d|))))) ;applpar1(x, y, y1, y2, d) == ; (y1 = y2) => APP('"(", x, y2, d) @@ -5480,7 +5480,7 @@ NIL ((BOOT-EQUAL |y1| |y2|) (APP "(" |x| |y2| |d|)) ('T (APP "(" |x| |y2| - (|applpar1| |x| |y| |y1| (SPADDIFFERENCE |y2| 1) |d|))))) + (|applpar1| |x| |y| |y1| (- |y2| 1) |d|))))) ;--The body of the function appelse assigns 6 local variables. ;--It then finishes by calling apprpar. @@ -5498,7 +5498,7 @@ NIL (RETURN (PROGN (setq |w| (WIDTH (CAAR |u|))) - (setq |b| (SPADDIFFERENCE |y| (|subspan| (CDR |u|)))) + (setq |b| (- |y| (|subspan| (CDR |u|)))) (setq |p| (+ |y| (|superspan| (CDR |u|)))) (setq |temparg1| (APP (|keyp| |u|) |x| |y| |d|)) (setq |temparg2| @@ -5533,7 +5533,7 @@ NIL (PROGN (setq |xptr| |x|) (setq |yptr| - (SPADDIFFERENCE |y| + (- |y| (+ (+ (|subspan| (CADR |u|)) (|superspan| (|agg| 3 |u|))) 1))) @@ -5569,7 +5569,7 @@ NIL (COND ((BOOT-EQUAL |x1| |x2|) |d|) ('T - (|apphor| |x1| (SPADDIFFERENCE |x2| 1) |y| |d| + (|apphor| |x1| (- |x2| 1) |y| |d| |char|)))) (APP |char| |x2| |y| |temp|))))) @@ -5621,7 +5621,7 @@ NIL (APP |sc| (+ |x| 1) |y| |d|)) (COND (|dp| (setq |bot| - (SPADDIFFERENCE |y| + (- |y| (|subspan| |ac|))) (setq |top| (+ |y| (|superspan| |ac|))) @@ -5640,7 +5640,7 @@ NIL ; appsum(LIST u, x - 1, y, d) (DEFUN |appneg| (|u| |x| |y| |d|) - (|appsum| (LIST |u|) (SPADDIFFERENCE |x| 1) |y| |d|)) + (|appsum| (LIST |u|) (- |x| 1) |y| |d|)) ;appparu(u, x, y, d) == ; bot := y - subspan u @@ -5653,7 +5653,7 @@ NIL (PROG (|bot| |top| |temparg1| |temparg2|) (RETURN (PROGN - (setq |bot| (SPADDIFFERENCE |y| (|subspan| |u|))) + (setq |bot| (- |y| (|subspan| |u|))) (setq |top| (+ |y| (|superspan| |u|))) (setq |temparg1| (|applpar| |x| |y| |bot| |top| |d|)) (setq |temparg2| (APP |u| (+ |x| 1) |y| |temparg1|)) @@ -5700,7 +5700,7 @@ NIL (PROGN (setq |temparg1| (+ |x| (WIDTH (CADR |u|)))) (setq |temparg2| - (SPADDIFFERENCE (SPADDIFFERENCE |y| 1) + (- (- |y| 1) (|superspan| (CDDR |u|)))) (setq |temparg3| (APP (CADR |u|) |x| |y| |d|)) (|appagg| (CDDR |u|) |temparg1| |temparg2| |temparg3|))))) @@ -5813,22 +5813,22 @@ NIL (setq |tempx| (+ |x| (QUOTIENT - (SPADDIFFERENCE (+ 1 |w|) + (- (+ 1 |w|) (WIDTH (CADR (CDR |u|)))) 2))) (setq |tempy| - (SPADDIFFERENCE - (SPADDIFFERENCE |y| + (- + (- |y| (|superspan| (CADR (CDR |u|)))) 1)) (setq |temparg3| (APP (CADR (CDR |u|)) |tempx| |tempy| |d|)) (setq |temparg4| - (|apphor| |x| (SPADDIFFERENCE (+ |x| |w|) 1) |y| + (|apphor| |x| (- (+ |x| |w|) 1) |y| |temparg3| (|specialChar| '|hbar|))) (APP (CADR |u|) (+ |x| (QUOTIENT - (SPADDIFFERENCE (+ 1 |w|) (WIDTH (CADR |u|))) + (- (+ 1 |w|) (WIDTH (CADR |u|))) 2)) (+ (+ |y| 1) (|subspan| (CADR |u|))) |temparg4|))))) @@ -5954,7 +5954,7 @@ NIL ('T (setq |temparg| (|appvertline| |char| |x| |yl| - (SPADDIFFERENCE |yu| 1) |d|)) + (- |yu| 1) |d|)) (APP |char| |x| |yu| |temparg|)))))) ;appHorizLine(xl, xu, y, d) == @@ -5969,7 +5969,7 @@ NIL ((> |xl| |xu|) |d|) ('T (setq |temparg| - (|appHorizLine| |xl| (SPADDIFFERENCE |xu| 1) |y| |d|)) + (|appHorizLine| |xl| (- |xu| 1) |y| |d|)) (APP MATBORCH |xu| |y| |temparg|)))))) ;rootApp(u, x, y, d) == @@ -6001,7 +6001,7 @@ NIL (setq |subR| (|subspan| (ELT |u| 2))) (setq |d| (APP (ELT |u| 2) |x| - (+ (+ (SPADDIFFERENCE |y| |subB|) 1) + (+ (+ (- |y| |subB|) 1) |subR|) |d|))) ('T (setq |widR| 1))) @@ -6014,7 +6014,7 @@ NIL (|specialChar| '|hbar|))) (setq |d| (|appvertline| (|specialChar| '|vbar|) - (+ |x| |widR|) (SPADDIFFERENCE |y| |subB|) + (+ |x| |widR|) (- |y| |subB|) (+ |y| |supB|) |d|)) (setq |d| (APP (|specialChar| '|ulc|) (+ |x| |widR|) @@ -6025,8 +6025,8 @@ NIL (+ (+ |y| |supB|) 1) |d|)) (setq |d| (APP (|specialChar| '|bslash|) - (SPADDIFFERENCE (+ |x| |widR|) 1) - (SPADDIFFERENCE |y| |subB|) |d|)))))) + (- (+ |x| |widR|) 1) + (- |y| |subB|) |d|)))))) ;boxApp(u, x, y, d) == ; CDDR u => boxLApp(u, x, y, d) @@ -6053,15 +6053,15 @@ NIL (setq |w| (+ 2 (WIDTH (ELT |u| 1)))) (setq |d| (|appvertline| (|specialChar| '|vbar|) |x| - (+ (SPADDIFFERENCE |y| |b|) 1) - (SPADDIFFERENCE (+ |y| |a|) 1) |d|)) + (+ (- |y| |b|) 1) + (- (+ |y| |a|) 1) |d|)) (setq |d| (|appvertline| (|specialChar| '|vbar|) - (+ (+ |x| |w|) 1) (SPADDIFFERENCE |y| |b|) + (+ (+ |x| |w|) 1) (- |y| |b|) (+ |y| |a|) |d|)) (setq |d| (|apphor| (+ |x| 1) (+ |x| |w|) - (SPADDIFFERENCE |y| |b|) |d| + (- |y| |b|) |d| (|specialChar| '|hbar|))) (setq |d| (|apphor| (+ |x| 1) (+ |x| |w|) (+ |y| |a|) @@ -6073,10 +6073,10 @@ NIL (+ |y| |a|) |d|)) (setq |d| (APP (|specialChar| '|llc|) |x| - (SPADDIFFERENCE |y| |b|) |d|)) + (- |y| |b|) |d|)) (setq |d| (APP (|specialChar| '|lrc|) (+ (+ |x| |w|) 1) - (SPADDIFFERENCE |y| |b|) |d|)) + (- |y| |b|) |d|)) (setq |d| (APP (ELT |u| 1) (+ 2 |x|) |y| |d|))))))) ;boxLApp(u, x, y, d) == @@ -6112,7 +6112,7 @@ NIL (setq |w| (MAX |lw| (+ 2 (WIDTH (ELT |u| 1))))) (setq |top| (+ (+ |y| |a|) |lh|)) (setq |d| - (|appvertline| MATBORCH |x| (SPADDIFFERENCE |y| |b|) + (|appvertline| MATBORCH |x| (- |y| |b|) |top| |d|)) (setq |d| (|appHorizLine| (+ |x| 1) (+ |x| |w|) |top| |d|)) @@ -6126,14 +6126,14 @@ NIL ((OR NIL (> |w| |lw|)) (setq |d| (|appvertline| MATBORCH (+ (+ |x| |lw|) 1) - (+ |y| |a|) (SPADDIFFERENCE |top| 1) |d|))) + (+ |y| |a|) (- |top| 1) |d|))) ('T (setq |d| (APP (ELT |u| 1) (+ 2 |x|) |y| |d|)) (setq |d| (|appHorizLine| (+ |x| 1) (+ |x| |w|) - (SPADDIFFERENCE |y| |b|) |top| |d|)) + (- |y| |b|) |top| |d|)) (setq |d| (|appvertline| MATBORCH (+ (+ |x| |w|) 1) - (SPADDIFFERENCE |y| |b|) |top| |d|)))))))) + (- |y| |b|) |top| |d|)))))))) ;boxSub(x) == ; subspan x.1+1 @@ -6233,38 +6233,38 @@ NIL (setq |denx| (+ |x| (QUOTIENT - (SPADDIFFERENCE |w| + (- |w| (WIDTH (CADR (CDR |u|)))) 2))) (setq |deny| - (SPADDIFFERENCE - (SPADDIFFERENCE |y| + (- + (- |y| (|superspan| (CADR (CDR |u|)))) 1)) (setq |d| (APP (CADR (CDR |u|)) |denx| |deny| |d|)) (setq |numx| (+ |x| (QUOTIENT - (SPADDIFFERENCE |w| (WIDTH (CADR |u|))) 2))) + (- |w| (WIDTH (CADR |u|))) 2))) (setq |numy| (+ (+ |y| 1) (|subspan| (CADR |u|)))) (setq |d| (APP (CADR |u|) |numx| |numy| |d|)) (setq |a| (+ 1 (|zagSuper| |u|))) (setq |b| (+ 1 (|zagSub| |u|))) (setq |d| (|appvertline| (|specialChar| '|vbar|) |x| - (SPADDIFFERENCE |y| |b|) (SPADDIFFERENCE |y| 1) + (- |y| |b|) (- |y| 1) |d|)) (setq |d| (|appvertline| (|specialChar| '|vbar|) - (SPADDIFFERENCE (+ |x| |w|) 1) (+ |y| 1) + (- (+ |x| |w|) 1) (+ |y| 1) (+ |y| |a|) |d|)) (setq |d| - (|apphor| |x| (SPADDIFFERENCE (+ |x| |w|) 2) |y| + (|apphor| |x| (- (+ |x| |w|) 2) |y| |d| (|specialChar| '|hbar|))) (setq |d| (APP (|specialChar| '|ulc|) |x| |y| |d|)) (setq |d| (APP (|specialChar| '|lrc|) - (SPADDIFFERENCE (+ |x| |w|) 1) |y| |d|)))))) + (- (+ |x| |w|) 1) |y| |d|)))))) ;zagSub(u) == ; height CADR rest u @@ -6318,7 +6318,7 @@ NIL (COND ((<= (|#| |x|) 2) |normal|) ((MINUSP (setq |radOver| - (SPADDIFFERENCE (|height| (ELT |x| 2)) + (- (|height| (ELT |x| 2)) (|height| (ELT |x| 1))))) |normal|) ('T (+ |normal| |radOver|))))))) @@ -6372,7 +6372,7 @@ NIL (setq |p| (|matSuper| |u|)) (setq |q| (|matSub| |u|)) (setq |d| - (|matrixBorder| |x| (SPADDIFFERENCE |y| |q|) + (|matrixBorder| |x| (- |y| |q|) (+ |y| |p|) |d| '|left|)) (setq |x| (+ 1 |x|)) (setq |yc| (+ (+ 1 |y|) |p|)) @@ -6385,14 +6385,14 @@ NIL ((NULL |rows|) (RETURN (|matrixBorder| - (SPADDIFFERENCE + (- (+ |x| (WIDTH |u|)) 2) - (SPADDIFFERENCE |y| |q|) + (- |y| |q|) (+ |y| |p|) |d| '|right|))) ('T (setq |xc| |x|) (setq |yc| - (SPADDIFFERENCE - (SPADDIFFERENCE |yc| 1) + (- + (- |yc| 1) (CAR |superl|))) (setq |w| |wl|) (setq |row| (CDAR |rows|)) @@ -6412,8 +6412,8 @@ NIL (EXIT (PROGN (setq |yc| - (SPADDIFFERENCE - (SPADDIFFERENCE |yc| + (- + (- |yc| 1) (CAR |subl|))) (setq |subl| @@ -6432,7 +6432,7 @@ NIL (APP (CAR |row|) (+ |xc| (QUOTIENT - (SPADDIFFERENCE (CAR |w|) + (- (CAR |w|) (WIDTH (CAR |row|))) 2)) |yc| |d|)) @@ -6449,7 +6449,7 @@ NIL (DEFUN |matSuper| (|x|) (COND ((setq |x| (ELT |x| 1)) - (+ (SPADDIFFERENCE 1) + (+ (- 1) (QUOTIENT (+ (CAR (ELT |x| 1)) (CAR (ELT |x| 2))) 2))) ('T (ERROR 'MAT)))) @@ -6461,7 +6461,7 @@ NIL (COND ((setq |x| (ELT |x| 1)) (QUOTIENT - (+ (+ (SPADDIFFERENCE 1) (CAR (ELT |x| 1))) + (+ (+ (- 1) (CAR (ELT |x| 1))) (CAR (ELT |x| 2))) 2)) ('T (ERROR 'MAT)))) @@ -6564,7 +6564,7 @@ NIL ; -1 + sumWidthA rest u (DEFUN |minusWidth| (|u|) - (+ (SPADDIFFERENCE 1) (|sumWidthA| (CDR |u|)))) + (+ (- 1) (|sumWidthA| (CDR |u|)))) ;-- opSrch(name, x) == ;-- LASSOC(name, x) or '"," @@ -6639,10 +6639,10 @@ NIL ((NULL (CDR |x|)) (RETURN (setq |s| - (SPADDIFFERENCE 1))))))))) + (- 1))))))))) (OR NIL (COND - ((EQ |s| (SPADDIFFERENCE 1)) + ((EQ |s| (- 1)) (setq |nextu| NIL)) ((EQ |lastx| |u|) (setq |nextu| (CDR |u|)) @@ -6690,18 +6690,18 @@ NIL (|$testOutputLineFlag| (setq |string| (STRCONC (|fillerSpaces| - (MAX 0 (SPADDIFFERENCE |start| 1))) + (MAX 0 (- |start| 1))) |op|)) (setq |$testOutputLineList| (CONS |string| |$testOutputLineList|))) ('T - (PRINC (|fillerSpaces| (MAX 0 (SPADDIFFERENCE |start| 1))) + (PRINC (|fillerSpaces| (MAX 0 (- |start| 1))) |$algebraOutputStream|) (COND (|$collectOutput| (setq |string| (STRCONC (|fillerSpaces| - (MAX 0 (SPADDIFFERENCE |start| 1))) + (MAX 0 (- |start| 1))) |op|)) (setq |$outputLines| (CONS |string| |$outputLines|))) ('T (PRINC |op| |$algebraOutputStream|) @@ -6821,7 +6821,7 @@ NIL (setq |ab| (|subspan| |a|)) (setq |aw| (WIDTH |a|)) (setq |di| - (APP |d| (+ |x| (SPADDIFFERENCE |aox| |wd|)) + (APP |d| (+ |x| (- |aox| |wd|)) (+ (+ (+ 1 |ar|) |y|) (|subspan| |d|)) |di|)) (setq |di| (APP |a| (+ |x| |aox|) |y| |di|)) @@ -6830,13 +6830,13 @@ NIL (+ (+ (+ 1 |y|) |ar|) (|subspan| |c|)) |di|)) (setq |di| - (APP |e| (+ |x| (SPADDIFFERENCE |aox| |we|)) - (SPADDIFFERENCE (SPADDIFFERENCE |y| 1) + (APP |e| (+ |x| (- |aox| |we|)) + (- (- |y| 1) (MAX (|superspan| |e|) |ab|)) |di|)) (setq |di| (APP |b| (+ (+ |aox| |aw|) |x|) - (SPADDIFFERENCE (SPADDIFFERENCE |y| 1) + (- (- |y| 1) (MAX |ab| (|superspan| |b|))) |di|)) (RETURN |di|))))) @@ -6904,7 +6904,7 @@ NIL (setq |num| (CAR |LETTMP#1|)) (setq |den| (CADR |LETTMP#1|)) (setq |ysub| - (SPADDIFFERENCE (SPADDIFFERENCE |y| 1) + (- (- |y| 1) (|superspan| |den|))) (setq |ysup| (+ (+ |y| 1) (|subspan| |num|))) (setq |wden| (WIDTH |den|)) @@ -6913,19 +6913,19 @@ NIL (setq |d| (APP |den| (+ (+ |x| 1) - (QUOTIENT (SPADDIFFERENCE |w| |wden|) + (QUOTIENT (- |w| |wden|) 2)) |ysub| |d|)) (setq |d| (APP |num| (+ (+ |x| 1) - (QUOTIENT (SPADDIFFERENCE |w| |wnum|) + (QUOTIENT (- |w| |wnum|) 2)) |ysup| |d|)) (setq |hnum| (|height| |num|)) (setq |hden| (|height| |den|)) (setq |w| (+ 1 |w|)) - (DO ((G170072 (SPADDIFFERENCE |hnum| 1)) + (DO ((G170072 (- |hnum| 1)) (|j| 0 (QSADD1 |j|))) ((QSGREATERP |j| G170072) NIL) (SEQ (EXIT (PROGN @@ -6936,17 +6936,17 @@ NIL (|appChar| (|specialChar| '|vbar|) (+ |x| |w|) (+ |y| |j|) |d|)))))) - (DO ((G170081 (SPADDIFFERENCE |hden| 1)) + (DO ((G170081 (- |hden| 1)) (|j| 1 (QSADD1 |j|))) ((QSGREATERP |j| G170081) NIL) (SEQ (EXIT (PROGN (setq |d| (|appChar| (|specialChar| '|vbar|) - |x| (SPADDIFFERENCE |y| |j|) |d|)) + |x| (- |y| |j|) |d|)) (setq |d| (|appChar| (|specialChar| '|vbar|) (+ |x| |w|) - (SPADDIFFERENCE |y| |j|) |d|)))))) + (- |y| |j|) |d|)))))) (setq |d| (|appChar| (|specialChar| '|ulc|) |x| (+ |y| |hnum|) |d|)) @@ -6955,10 +6955,10 @@ NIL (+ |y| |hnum|) |d|)) (setq |d| (|appChar| (|specialChar| '|llc|) |x| - (SPADDIFFERENCE |y| |hden|) |d|)) + (- |y| |hden|) |d|)) (setq |d| (|appChar| (|specialChar| '|lrc|) (+ |x| |w|) - (SPADDIFFERENCE |y| |hden|) |d|))))))) + (- |y| |hden|) |d|))))))) ;binomSub u == height CADDR u @@ -7006,7 +7006,7 @@ NIL (setq |sublist| (|everyNth| (setq |u| (CDR |u|)) 2)) (setq |suplist| (|everyNth| (IFCDR |u|) 2)) (setq |ysub| - (SPADDIFFERENCE (SPADDIFFERENCE |y| 1) + (- (- |y| 1) (APPLY 'MAX (CONS |ab| (PROG (G170124) @@ -7301,19 +7301,19 @@ NIL NIL) (SEQ (EXIT (PROGN (setq |y| - (SPADDIFFERENCE - (SPADDIFFERENCE |y| + (- + (- |y| (|superspan| |a|)) 1)) (setq |xoff| (QUOTIENT - (SPADDIFFERENCE |w| (WIDTH |a|)) + (- |w| (WIDTH |a|)) 2)) (setq |d| (APP |a| (+ |x| |xoff|) |y| |d|)) (setq |y| - (SPADDIFFERENCE |y| + (- |y| (|subspan| |a|))))))) |d|))))) @@ -7340,11 +7340,11 @@ NIL (setq |w| (|vConcatWidth| |u|)) (setq |d| (APP "(" |x| |y| |d|)) (setq |x| (+ |x| 1)) - (setq |y1| (SPADDIFFERENCE |y| (|height| |a|))) - (setq |xoff| (QUOTIENT (SPADDIFFERENCE |w| (WIDTH |a|)) 2)) + (setq |y1| (- |y| (|height| |a|))) + (setq |xoff| (QUOTIENT (- |w| (WIDTH |a|)) 2)) (setq |d| (APP |a| (+ |x| |xoff|) |y1| |d|)) (setq |y2| (+ |y| (|height| |b|))) - (setq |xoff| (QUOTIENT (SPADDIFFERENCE |w| (WIDTH |b|)) 2)) + (setq |xoff| (QUOTIENT (- |w| (WIDTH |b|)) 2)) (setq |d| (APP |b| (+ |x| |xoff|) |y2| |d|)) (setq |x| (+ |x| |w|)) (APP ")" |x| |y| |d|))))) diff --git a/src/interp/i-spec1.lisp.pamphlet b/src/interp/i-spec1.lisp.pamphlet index 8d99532..595955f 100644 --- a/src/interp/i-spec1.lisp.pamphlet +++ b/src/interp/i-spec1.lisp.pamphlet @@ -3608,7 +3608,7 @@ There are several special modes used in these functions: ; -- count from the end of the list. ; l-p-1 -(DEFUN |positionInVec| (|p| |l|) (SPADDIFFERENCE (SPADDIFFERENCE |l| |p|) 1)) +(DEFUN |positionInVec| (|p| |l|) (- (- |l| |p|) 1)) ;collectSeveralStreams(t,op,itrl,body) == ; -- performs collects over several streams in parallel @@ -3942,15 +3942,15 @@ There are several special modes used in these functions: (COND ((EQL |n| 2) (CONS (|mkAtreeNode| '|elt|) - (CONS (|mkNestedElts| (SPADDIFFERENCE |numVars| 2)) + (CONS (|mkNestedElts| (- |numVars| 2)) (CONS (|mkAtreeNode| '|part2|) NIL)))) ((EQL |n| 1) (CONS (|mkAtreeNode| '|elt|) - (CONS (|mkNestedElts| (SPADDIFFERENCE |numVars| 2)) + (CONS (|mkNestedElts| (- |numVars| 2)) (CONS (|mkAtreeNode| '|part1|) NIL)))) ('T (CONS (|mkAtreeNode| '|elt|) - (CONS (|mkNestedElts| (SPADDIFFERENCE |numVars| |n|)) + (CONS (|mkNestedElts| (- |numVars| |n|)) (CONS (|mkAtreeNode| '|part1|) NIL))))))))) ;iterVarPos var == @@ -3986,7 +3986,7 @@ There are several special modes used in these functions: (|mkAtreeNode| (OR |$index| (setq |$index| (GENSYM))))) ('T (CONS (|mkAtreeNode| '|elt|) - (CONS (|mkNestedElts| (SPADDIFFERENCE |n| 1)) + (CONS (|mkNestedElts| (- |n| 1)) (CONS (|mkAtreeNode| '|part2|) NIL)))))) ;--% Handlers for construct @@ -4933,7 +4933,7 @@ There are several special modes used in these functions: (COND ((NULL |margs|) 0) ((CONSP |margs|) - (+ (SPADDIFFERENCE 1) (|#| |margs|))) + (+ (- 1) (|#| |margs|))) ('T 1))) (COND ((NEQUAL |nargs| (|#| |args|)) diff --git a/src/interp/i-spec2.lisp.pamphlet b/src/interp/i-spec2.lisp.pamphlet index 45f8a4c..9f41332 100644 --- a/src/interp/i-spec2.lisp.pamphlet +++ b/src/interp/i-spec2.lisp.pamphlet @@ -1457,7 +1457,7 @@ There are several special modes used in these functions: (setq |var| (QCAR |ISTMP#1|)) 'T)))) (setq |n| (|#| |restPats|)) - (setq |m| (SPADDIFFERENCE (|#| |l|) |n|)) + (setq |m| (- (|#| |l|) |n|)) (COND ((MINUSP |m|) (setq |$subs| '|failed|)) ((ZEROP |n|) diff --git a/src/interp/i-util.lisp.pamphlet b/src/interp/i-util.lisp.pamphlet index 624ce42..91bd14b 100644 --- a/src/interp/i-util.lisp.pamphlet +++ b/src/interp/i-util.lisp.pamphlet @@ -123,7 +123,7 @@ lisp code is unwrapped. (RETURN (COND ((ATOM (setq |x| ($SCREENSIZE))) NIL) - ('T (setq |p| (SPADDIFFERENCE (CAR |x|) 2)) + ('T (setq |p| (- (CAR |x|) 2)) (setq |y| $OLDLINE) (SETQ $OLDLINE NIL) (COND (|y| ($SHOWLINE (STRCONC |str| (EBCDIC 19) |y|) |p|)) @@ -173,7 +173,7 @@ lisp code is unwrapped. (BOOT-EQUAL (|#| |$ZeroVecCache|) |n|)) |$ZeroVecCache|) ('T (setq |$ZeroVecCache| (make-array |n|)) - (DO ((G166122 (SPADDIFFERENCE |n| 1)) (|i| 0 (QSADD1 |i|))) + (DO ((G166122 (- |n| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166122) NIL) (SEQ (EXIT (SETELT |$ZeroVecCache| |i| 0)))) |$ZeroVecCache|)))) @@ -580,7 +580,7 @@ lisp code is unwrapped. (SETQ G166405 (CONS |p| G166405)))))))))) (setq |numberWithoutPredicate| - (SPADDIFFERENCE (|#| |listOfEntries|) + (- (|#| |listOfEntries|) (|#| |nonEmptyPredList|))) (setq |predList| (COND diff --git a/src/interp/info.lisp.pamphlet b/src/interp/info.lisp.pamphlet index 2474b55..46d9bc7 100644 --- a/src/interp/info.lisp.pamphlet +++ b/src/interp/info.lisp.pamphlet @@ -954,7 +954,7 @@ modemap is of the form : ((op (targ arg1 arg2 ... argn)) pred (elt $ n)) ((BOOT-EQUAL |name| '$) (CONS 'ELT (CONS |name| - (CONS (SPADDIFFERENCE 1) NIL)))) + (CONS (- 1) NIL)))) ('T (CONS 'ELT (CONS |name| diff --git a/src/interp/interop.lisp.pamphlet b/src/interp/interop.lisp.pamphlet index 8ed40ef..1f31da5 100644 --- a/src/interp/interop.lisp.pamphlet +++ b/src/interp/interop.lisp.pamphlet @@ -225,7 +225,7 @@ ; SUBSTRING(str, 0, (LENGTH str - 1)) (DEFUN |CompStrToString| (|str|) - (SUBSTRING |str| 0 (SPADDIFFERENCE (LENGTH |str|) 1))) + (SUBSTRING |str| 0 (- (LENGTH |str|) 1))) ;-- local garbage ends ;runOldAxiomFunctor(:allArgs) == @@ -543,13 +543,13 @@ (PROGN (setq |parvec| (CADDDR G166272)) (setq |dom| (CAR (CDDDDR G166272))) - (setq |catform| (ELT |parvec| (SPADDIFFERENCE |n| 1))) + (setq |catform| (ELT |parvec| (- |n| 1))) (COND ((VECTORP (KAR |catform|)) |catform|) ('T (setq |newcat| (|oldAxiomPreCategoryBuild| |catform| |dom| NIL)) - (SETELT |parvec| (SPADDIFFERENCE |n| 1) |newcat|) |newcat|)))))) + (SETELT |parvec| (- |n| 1) |newcat|) |newcat|)))))) ;oldAxiomCategoryBuild([catform,:.], dom, env) == ; oldAxiomPreCategoryBuild(catform,dom, env) diff --git a/src/interp/match.lisp.pamphlet b/src/interp/match.lisp.pamphlet index d984067..7db0471 100644 --- a/src/interp/match.lisp.pamphlet +++ b/src/interp/match.lisp.pamphlet @@ -61,13 +61,13 @@ (setq |np| (SIZE |part|)) (setq |nw| (SIZE |whole|)) (COND - ((> |np| (SPADDIFFERENCE |nw| |startpos|)) NIL) + ((> |np| (- |nw| |startpos|)) NIL) ('T (PROG (G166078) (setq G166078 'T) (RETURN (DO ((G166085 NIL (NULL G166078)) - (G166086 (SPADDIFFERENCE |np| 1)) + (G166086 (- |np| 1)) (|ip| 0 (QSADD1 |ip|)) (|iw| |startpos| (+ |iw| 1))) ((OR G166085 (QSGREATERP |ip| G166086)) @@ -94,7 +94,7 @@ (setq G166098 NIL) (RETURN (DO ((G166104 NIL G166098) - (G166105 (SPADDIFFERENCE |nw| |np|)) + (G166105 (- |nw| |np|)) (|i| |startpos| (+ |i| 1))) ((OR G166104 (> |i| G166105)) G166098) (SEQ (EXIT (SETQ G166098 @@ -107,7 +107,7 @@ ((G166117 NIL (NULL G166110)) (G166118 - (SPADDIFFERENCE |np| 1)) + (- |np| 1)) (|ip| 0 (QSADD1 |ip|)) (|iw| |i| (+ |iw| 1))) ((OR G166117 @@ -141,7 +141,7 @@ (COND ((OR (MINUSP |startpos|) (> |startpos| |n|)) |n|) ('T (setq |k| |startpos|) - (DO ((G166136 (SPADDIFFERENCE |n| 1)) + (DO ((G166136 (- |n| 1)) (|i| |startpos| (+ |i| 1))) ((> |i| G166136) NIL) (SEQ (EXIT (COND @@ -160,12 +160,12 @@ (RETURN (SEQ (PROGN (setq |k| |startpos|) - (DO ((G166151 (SPADDIFFERENCE 1)) + (DO ((G166151 (- 1)) (|i| |startpos| (+ |i| G166151))) ((OR (IF (MINUSP G166151) (< |i| 0) (> |i| 0)) (NULL (NEQUAL |c| (ELT |t| |i|)))) NIL) - (SEQ (EXIT (setq |k| (SPADDIFFERENCE |k| 1))))) + (SEQ (EXIT (setq |k| (- |k| 1))))) |k|))))) ;stringPosition(s,t,startpos) == @@ -342,7 +342,7 @@ (SEQ (IF (> (|#| |s|) (setq |k| (|charPosition| |$oldWild| |s| |i|))) (EXIT (STRCONC (SUBSTRING |s| |i| - (SPADDIFFERENCE |k| |i|)) + (- |k| |i|)) |$wildCard| (|patternCheck,subWild| |s| (+ |k| 1))))) (EXIT (SUBSTRING |s| |i| NIL)))))) @@ -357,8 +357,8 @@ (STRCONC |new| (|patternCheck,subWild| (SUBSTRING |old| (+ |i| 2) - (SPADDIFFERENCE - (SPADDIFFERENCE (CAR |r|) |i|) 1)) + (- + (- (CAR |r|) |i|) 1)) (+ |i| 1))))))) (DEFUN |patternCheck| (|pattern|) @@ -488,8 +488,8 @@ (setq |s| (SUBSTRING |pattern| (+ |p| 1) - (SPADDIFFERENCE - (SPADDIFFERENCE |q| |p|) 1))) + (- + (- |q| |p|) 1))) (setq |i| (|stringPosition| |s| |target| |i|)) @@ -510,11 +510,11 @@ (|returnFlag| NIL) ('T (COND - ((NEQUAL |p| (SPADDIFFERENCE |q| 1)) + ((NEQUAL |p| (- |q| 1)) (setq |s| (SUBSTRING |pattern| (+ |p| 1) - (SPADDIFFERENCE - (SPADDIFFERENCE |q| |p|) 1))) + (- + (- |q| |p|) 1))) (COND ((NULL (|suffix?| |s| |target|)) (RETURN NIL))) (COND ((NULL |ans|) (setq |ans| 1)) ('T NIL)))) @@ -574,7 +574,7 @@ (COND ((BOOT-EQUAL |m| (|#| |target|)) NIL) ((NULL |nc|) 'T) - ('T (<= |m| (SPADDIFFERENCE (+ |k| |nc|) |n|))))) + ('T (<= |m| (- (+ |k| |nc|) |n|))))) ('T (COND ((AND (NEQUAL |k| 0) |nc|) @@ -598,8 +598,8 @@ (setq |s| (SUBSTRING |pattern| (+ |p| 1) - (SPADDIFFERENCE - (SPADDIFFERENCE |q| |p|) 1))) + (- + (- |q| |p|) 1))) (setq |i| (|stringPosition| |s| |target| |i|)) @@ -615,11 +615,11 @@ (|returnFlag| NIL) ('T (COND - ((NEQUAL |p| (SPADDIFFERENCE |q| 1)) + ((NEQUAL |p| (- |q| 1)) (setq |s| (SUBSTRING |pattern| (+ |p| 1) - (SPADDIFFERENCE - (SPADDIFFERENCE |q| |p|) 1))) + (- + (- |q| |p|) 1))) (COND ((NULL (|suffix?| |s| |target|)) (RETURN NIL))) (COND ((NULL |ans|) (setq |ans| 1)) ('T NIL)))) @@ -647,7 +647,7 @@ (setq |m| (|#| |s|)) (setq |n| (|#| |t|)) (COND ((> |m| |n|) (RETURN NIL))) - (|substring?| |s| |t| (SPADDIFFERENCE |n| |m|)))))) + (|substring?| |s| |t| (- |n| |m|)))))) \end{chunk} \eject diff --git a/src/interp/nag-c02.lisp.pamphlet b/src/interp/nag-c02.lisp.pamphlet index 13cc2f2..f62ab3d 100644 --- a/src/interp/nag-c02.lisp.pamphlet +++ b/src/interp/nag-c02.lisp.pamphlet @@ -127,7 +127,7 @@ (setq |prefix| (STRCONC |prefix| (princ-to-string - (+ (SPADDIFFERENCE |n| |i|) 1)) + (+ (- |n| |i|) 1)) "\\space{1}")) (setq |post| "\\tab{30} ") (setq |post| (STRCONC |post| "\\space{1}")) @@ -469,7 +469,7 @@ (setq |prefix| (STRCONC |prefix| (princ-to-string - (+ (SPADDIFFERENCE |n| |i|) 1)) + (+ (- |n| |i|) 1)) "\\space{1}")) (setq |rnam| (INTERN (STRCONC "r" diff --git a/src/interp/nag-c05.lisp.pamphlet b/src/interp/nag-c05.lisp.pamphlet index 8f84619..ae41a41 100644 --- a/src/interp/nag-c05.lisp.pamphlet +++ b/src/interp/nag-c05.lisp.pamphlet @@ -148,7 +148,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |temp1| (COND ((> |temp| 0.0) |eps|) @@ -305,7 +305,7 @@ (princ-to-string |i|)))) (EXIT (CONS '|bcStrings| (CONS (CONS 4 - (CONS (SPADDIFFERENCE 1.0) + (CONS (- 1.0) (CONS |xnam| (CONS 'F NIL)))) NIL))))))) @@ -711,7 +711,7 @@ (princ-to-string |i|)))) (EXIT (CONS '|bcStrings| (CONS (CONS 4 - (CONS (SPADDIFFERENCE 1.0) + (CONS (- 1.0) (CONS |xnam| (CONS 'F NIL)))) NIL))))))) diff --git a/src/interp/nag-d01.lisp.pamphlet b/src/interp/nag-d01.lisp.pamphlet index 9680154..97bd8d4 100644 --- a/src/interp/nag-d01.lisp.pamphlet +++ b/src/interp/nag-d01.lisp.pamphlet @@ -167,7 +167,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |express| (|htpLabelInputString| |htPage| '|expression|)) (setq |liw| (QUOTIENT |lw| 4)) @@ -335,7 +335,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |express| (|htpLabelInputString| |htPage| '|expression|)) (setq |liw| (QUOTIENT |lw| 4)) @@ -543,7 +543,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |express| (|htpLabelInputString| |htPage| '|expression|)) (setq |liw| (QUOTIENT |lw| 2)) @@ -730,7 +730,7 @@ (COND ((BOOT-EQUAL |infinity| '|plus|) 1) ((BOOT-EQUAL |infinity| '|minus|) - (SPADDIFFERENCE 1)) + (- 1)) ('T 2))) (setq |epsabs| (|htpLabelInputString| |htPage| '|epsabs|)) (setq |epsrel| (|htpLabelInputString| |htPage| '|epsrel|)) @@ -738,7 +738,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |express| (|htpLabelInputString| |htPage| '|expression|)) (setq |liw| (QUOTIENT |lw| 4)) @@ -936,7 +936,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |express| (|htpLabelInputString| |htPage| '|expression|)) (setq |liw| (QUOTIENT |lw| 4)) @@ -1166,7 +1166,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |liw| (QUOTIENT |lw| 4)) (setq |prefix| (STRCONC '|d01apf(| |a| '| ,| |b| '| ,| |alpha| '| ,| @@ -1349,7 +1349,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |liw| (QUOTIENT |lw| 4)) (setq |prefix| (STRCONC '|d01aqf(| |a| '| ,| |b| '| ,| |c| '| ,| @@ -1553,7 +1553,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |express| (|htpLabelInputString| |htPage| '|expression|)) (setq |liw| (QUOTIENT |lw| 2)) @@ -3036,7 +3036,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |prefix| (STRCONC '|d01bbf(| |a| '| ,| |b| '| ,| (princ-to-string |itype|) '| ,|)) diff --git a/src/interp/nag-e02.lisp.pamphlet b/src/interp/nag-e02.lisp.pamphlet index 64de176..73271c3 100644 --- a/src/interp/nag-e02.lisp.pamphlet +++ b/src/interp/nag-e02.lisp.pamphlet @@ -5572,8 +5572,8 @@ (setq G167213 NIL) (RETURN (DO ((G167218 - (TIMES (SPADDIFFERENCE |px| 4) - (SPADDIFFERENCE |py| 4))) + (TIMES (- |px| 4) + (- |py| 4))) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167218) G167213) (SEQ (EXIT @@ -5907,8 +5907,8 @@ (setq |alist| (|htpInputAreaAlist| |htPage|)) (setq |y| |alist|) (DO ((G167267 - (TIMES (SPADDIFFERENCE |px| 4) - (SPADDIFFERENCE |py| 4))) + (TIMES (- |px| 4) + (- |py| 4))) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167267) NIL) (SEQ (EXIT (PROGN @@ -6243,8 +6243,8 @@ (setq |liwrk| (COND ((BOOT-EQUAL |nwrkmin| |nwrk2|) - (SPADDIFFERENCE (+ |my| |py|) 4)) - ('T (SPADDIFFERENCE (+ |mx| |px|) 4)))) + (- (+ |my| |py|) 4)) + ('T (- (+ |mx| |px|) 4)))) (setq |error| (|htpButtonValue| |htPage| '|ifail|)) (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -6311,8 +6311,8 @@ (setq G167407 NIL) (RETURN (DO ((G167412 - (TIMES (SPADDIFFERENCE |px| 4) - (SPADDIFFERENCE |py| 4))) + (TIMES (- |px| 4) + (- |py| 4))) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167412) G167407) (SEQ (EXIT @@ -6640,8 +6640,8 @@ (setq |alist| (|htpInputAreaAlist| |htPage|)) (setq |y| |alist|) (DO ((G167475 - (TIMES (SPADDIFFERENCE |px| 4) - (SPADDIFFERENCE |py| 4))) + (TIMES (- |px| 4) + (- |py| 4))) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167475) NIL) (SEQ (EXIT (PROGN @@ -7140,12 +7140,12 @@ (setq |blist| (CONS |right| |blist|)))))) (setq |bstring| (|bcwords2liststring| |blist|)) (setq |y| (REVERSE |y|)) - (setq |k| (SPADDIFFERENCE 1)) + (setq |k| (- 1)) (setq |matform| (PROG (G167646) (setq G167646 NIL) (RETURN - (DO ((G167651 (SPADDIFFERENCE |la| 1)) + (DO ((G167651 (- |la| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G167651) (NREVERSE0 G167646)) @@ -7156,7 +7156,7 @@ (RETURN (DO ((G167664 - (SPADDIFFERENCE + (- |nplustwo| 1)) (|j| 0 (QSADD1 |j|))) ((QSGREATERP |j| @@ -7555,12 +7555,12 @@ (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|npoint|))))) (setq |nc| - (TIMES (SPADDIFFERENCE |px| 4) - (SPADDIFFERENCE |py| 4))) + (TIMES (- |px| 4) + (- |py| 4))) (setq |nws| - (SPADDIFFERENCE + (- (TIMES (+ (TIMES 2 |nc|) 1) - (SPADDIFFERENCE (TIMES 3 |py|) 6)) + (- (TIMES 3 |py|) 6)) 2)) (setq |eps| (|htpLabelInputString| |htPage| '|eps|)) (setq |error| (|htpButtonValue| |htPage| '|ifail|)) @@ -7586,7 +7586,7 @@ (PROG (G167760) (setq G167760 NIL) (RETURN - (DO ((G167765 (SPADDIFFERENCE |px| 4)) + (DO ((G167765 (- |px| 4)) (|i| 5 (+ |i| 1))) ((> |i| G167765) G167760) (SEQ (EXIT @@ -7607,7 +7607,7 @@ (PROG (G167769) (setq G167769 NIL) (RETURN - (DO ((G167774 (SPADDIFFERENCE |py| 4)) + (DO ((G167774 (- |py| 4)) (|i| 5 (+ |i| 1))) ((> |i| G167774) G167769) (SEQ (EXIT @@ -8385,8 +8385,8 @@ (setq |alist| (|htpInputAreaAlist| |htPage|)) (setq |y| |alist|) (setq |nadres| - (TIMES (SPADDIFFERENCE |px| 7) - (SPADDIFFERENCE |py| 7))) + (TIMES (- |px| 7) + (- |py| 7))) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |npoint|) NIL) (SEQ (EXIT (PROGN (setq |right| @@ -8398,7 +8398,7 @@ (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| 4) NIL) (SEQ (EXIT (setq |muList| (CONS "0 " |muList|))))) - (DO ((G167851 (SPADDIFFERENCE |py| 4)) + (DO ((G167851 (- |py| 4)) (|i| 5 (+ |i| 1))) ((> |i| G167851) NIL) (SEQ (EXIT (PROGN @@ -8406,7 +8406,7 @@ (STRCONC (ELT (CAR |y|) 1) '| |)) (setq |y| (CDR |y|)) (setq |muList| (CONS |right| |muList|)))))) - (DO ((|i| (SPADDIFFERENCE |py| 3) (+ |i| 1))) + (DO ((|i| (- |py| 3) (+ |i| 1))) ((> |i| |py|) NIL) (SEQ (EXIT (setq |muList| (CONS "0 " |muList|))))) @@ -8414,7 +8414,7 @@ (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| 4) NIL) (SEQ (EXIT (setq |lamList| (CONS "0 " |lamList|))))) - (DO ((G167873 (SPADDIFFERENCE |px| 4)) + (DO ((G167873 (- |px| 4)) (|i| 5 (+ |i| 1))) ((> |i| G167873) NIL) (SEQ (EXIT (PROGN @@ -8423,7 +8423,7 @@ (setq |y| (CDR |y|)) (setq |lamList| (CONS |right| |lamList|)))))) - (DO ((|i| (SPADDIFFERENCE |px| 3) (+ |i| 1))) + (DO ((|i| (- |px| 3) (+ |i| 1))) ((> |i| |px|) NIL) (SEQ (EXIT (setq |lamList| (CONS "0 " |lamList|))))) @@ -8451,8 +8451,8 @@ (setq |fstring| (|bcwords2liststring| |flist|)) (setq |wstring| (|bcwords2liststring| |wlist|)) (setq |nc| - (TIMES (SPADDIFFERENCE |px| 4) - (SPADDIFFERENCE |py| 4))) + (TIMES (- |px| 4) + (- |py| 4))) (setq |prefix| (STRCONC "e02daf(" (princ-to-string |m|) '|, | (princ-to-string |px|) '|, |)) @@ -9613,8 +9613,8 @@ ('T (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|nyest|))))) - (setq |u| (SPADDIFFERENCE |nxest| 4)) - (setq |v| (SPADDIFFERENCE |nyest| 4)) + (setq |u| (- |nxest| 4)) + (setq |v| (- |nyest| 4)) (setq |wlist| (CONS |u| (CONS |v| NIL))) (setq |w| (APPLY 'MAX |wlist|)) (setq |lwrk| @@ -9630,8 +9630,8 @@ 56)) (setq |liwrk| (+ |m| - (TIMES (TIMES 2 (SPADDIFFERENCE |nxest| 7)) - (SPADDIFFERENCE |nyest| 7)))) + (TIMES (TIMES 2 (- |nxest| 7)) + (- |nyest| 7)))) (setq |s| (|htpLabelInputString| |htPage| '|s|)) (setq |initial| (|htpButtonValue| |htPage| '|start|)) (setq |start| @@ -10874,7 +10874,7 @@ (PROG (G168437) (setq G168437 NIL) (RETURN - (DO ((G168442 (SPADDIFFERENCE |px| 4)) + (DO ((G168442 (- |px| 4)) (|i| 5 (+ |i| 1))) ((> |i| G168442) G168437) (SEQ (EXIT @@ -10891,7 +10891,7 @@ (PROG (G168446) (setq G168446 NIL) (RETURN - (DO ((G168451 (SPADDIFFERENCE |py| 4)) + (DO ((G168451 (- |py| 4)) (|i| 5 (+ |i| 1))) ((> |i| G168451) G168446) (SEQ (EXIT @@ -11128,12 +11128,12 @@ (setq |alist| (|htpInputAreaAlist| |htPage|)) (setq |y| |alist|) (setq |nadres| - (TIMES (SPADDIFFERENCE |px| 7) - (SPADDIFFERENCE |py| 7))) + (TIMES (- |px| 7) + (- |py| 7))) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| 4) NIL) (SEQ (EXIT (setq |muList| (CONS "0 " |muList|))))) - (DO ((G168502 (SPADDIFFERENCE |py| 4)) + (DO ((G168502 (- |py| 4)) (|i| 5 (+ |i| 1))) ((> |i| G168502) NIL) (SEQ (EXIT (PROGN @@ -11141,7 +11141,7 @@ (STRCONC (ELT (CAR |y|) 1) '| |)) (setq |y| (CDR |y|)) (setq |muList| (CONS |right| |muList|)))))) - (DO ((|i| (SPADDIFFERENCE |py| 3) (+ |i| 1))) + (DO ((|i| (- |py| 3) (+ |i| 1))) ((> |i| |py|) NIL) (SEQ (EXIT (setq |muList| (CONS "0 " |muList|))))) @@ -11149,7 +11149,7 @@ (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| 4) NIL) (SEQ (EXIT (setq |lamList| (CONS "0 " |lamList|))))) - (DO ((G168524 (SPADDIFFERENCE |px| 4)) + (DO ((G168524 (- |px| 4)) (|i| 5 (+ |i| 1))) ((> |i| G168524) NIL) (SEQ (EXIT (PROGN @@ -11158,7 +11158,7 @@ (setq |y| (CDR |y|)) (setq |lamList| (CONS |right| |lamList|)))))) - (DO ((|i| (SPADDIFFERENCE |px| 3) (+ |i| 1))) + (DO ((|i| (- |px| 3) (+ |i| 1))) ((> |i| |px|) NIL) (SEQ (EXIT (setq |lamList| (CONS "0 " |lamList|))))) diff --git a/src/interp/nag-e04.lisp.pamphlet b/src/interp/nag-e04.lisp.pamphlet index 2c7fedc..b0404b9 100644 --- a/src/interp/nag-e04.lisp.pamphlet +++ b/src/interp/nag-e04.lisp.pamphlet @@ -181,7 +181,7 @@ (princ-to-string |i|)))) (EXIT (CONS '|bcStrings| (CONS (CONS 8 - (CONS (SPADDIFFERENCE 1.0) + (CONS (- 1.0) (CONS |xnam| (CONS 'F NIL)))) NIL))))))) @@ -232,7 +232,7 @@ (CONS (CONS '|bcStrings| (CONS (CONS 8 - (CONS (SPADDIFFERENCE 1.0) + (CONS (- 1.0) (CONS '|x1| (CONS 'F NIL)))) NIL)) (CONS (CONS '|bcStrings| diff --git a/src/interp/nag-f01.lisp.pamphlet b/src/interp/nag-f01.lisp.pamphlet index 2207693..2b44d3f 100644 --- a/src/interp/nag-f01.lisp.pamphlet +++ b/src/interp/nag-f01.lisp.pamphlet @@ -736,7 +736,7 @@ (setq |cList| (CONS |end| |cList|)) (setq |rList| (CONS |mid| |rList|)) (setq |matList| (CONS |top| |matList|)))))) - (DO ((G166158 (SPADDIFFERENCE |licn| |nz|)) + (DO ((G166158 (- |licn| |nz|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166158) NIL) (SEQ (EXIT (PROGN @@ -746,7 +746,7 @@ (setq |matList| (APPEND |matList| (CONS "0 " NIL))))))) - (DO ((G166165 (SPADDIFFERENCE |lirn| |nz|)) + (DO ((G166165 (- |lirn| |nz|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166165) NIL) (SEQ (EXIT (setq |rList| @@ -1740,7 +1740,7 @@ (setq |cList| (CONS |end| |cList|)) (setq |rList| (CONS |mid| |rList|)) (setq |matList| (CONS |top| |matList|)))))) - (DO ((G166305 (SPADDIFFERENCE |licn| |nz|)) + (DO ((G166305 (- |licn| |nz|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166305) NIL) (SEQ (EXIT (PROGN @@ -1750,7 +1750,7 @@ (setq |matList| (APPEND |matList| (CONS "0 " NIL))))))) - (DO ((G166312 (SPADDIFFERENCE |lirn| |nz|)) + (DO ((G166312 (- |lirn| |nz|)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166312) NIL) (SEQ (EXIT (setq |rList| diff --git a/src/interp/nag-f04.lisp.pamphlet b/src/interp/nag-f04.lisp.pamphlet index 725b477..493f2c7 100644 --- a/src/interp/nag-f04.lisp.pamphlet +++ b/src/interp/nag-f04.lisp.pamphlet @@ -518,12 +518,12 @@ (setq |bList| (CONS |right| |bList|)))))) (setq |bstring| (|bcwords2liststring| |bList|)) (setq |y| (REVERSE |y|)) - (setq |k| (SPADDIFFERENCE 1)) + (setq |k| (- 1)) (setq |matform| (PROG (G166342) (setq G166342 NIL) (RETURN - (DO ((G166347 (SPADDIFFERENCE |ia| 1)) + (DO ((G166347 (- |ia| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166347) (NREVERSE0 G166342)) @@ -534,7 +534,7 @@ (RETURN (DO ((G166360 - (SPADDIFFERENCE |n| 1)) + (- |n| 1)) (|j| 0 (QSADD1 |j|))) ((QSGREATERP |j| G166360) @@ -967,12 +967,12 @@ (setq |bList| (CONS |right| |bList|)))))) (setq |bstring| (|bcwords2liststring| |bList|)) (setq |y| (REVERSE |y|)) - (setq |k| (SPADDIFFERENCE 1)) + (setq |k| (- 1)) (setq |matform| (PROG (G166491) (setq G166491 NIL) (RETURN - (DO ((G166496 (SPADDIFFERENCE |ia| 1)) + (DO ((G166496 (- |ia| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166496) (NREVERSE0 G166491)) @@ -983,7 +983,7 @@ (RETURN (DO ((G166509 - (SPADDIFFERENCE |n| 1)) + (- |n| 1)) (|j| 0 (QSADD1 |j|))) ((QSGREATERP |j| G166509) @@ -1415,12 +1415,12 @@ (setq |bList| (CONS |right| |bList|)))))) (setq |bstring| (|bcwords2liststring| |bList|)) (setq |y| (REVERSE |y|)) - (setq |k| (SPADDIFFERENCE 1)) + (setq |k| (- 1)) (setq |matform| (PROG (G166641) (setq G166641 NIL) (RETURN - (DO ((G166646 (SPADDIFFERENCE |ia| 1)) + (DO ((G166646 (- |ia| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166646) (NREVERSE0 G166641)) @@ -1431,7 +1431,7 @@ (RETURN (DO ((G166659 - (SPADDIFFERENCE |n| 1)) + (- |n| 1)) (|j| 0 (QSADD1 |j|))) ((QSGREATERP |j| G166659) @@ -1718,7 +1718,7 @@ (PROG (G166739) (setq G166739 NIL) (RETURN - (DO ((G166744 (SPADDIFFERENCE |n| 1)) + (DO ((G166744 (- |n| 1)) (|j| 1 (QSADD1 |j|))) ((QSGREATERP |j| G166744) G166739) (SEQ (EXIT @@ -1935,7 +1935,7 @@ (setq |bList| (CONS |b| |bList|)) (setq |y| (CDR |y|)))))) (setq |bstring| (|bcwords2liststring| |bList|)) - (DO ((G166809 (SPADDIFFERENCE |n| 1)) + (DO ((G166809 (- |n| 1)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G166809) NIL) (SEQ (EXIT (PROGN @@ -2461,7 +2461,7 @@ (setq |nullList| (APPEND |nullList| (CONS NULL NIL))))))) - (DO ((G166971 (SPADDIFFERENCE |nra| 1)) + (DO ((G166971 (- |nra| 1)) (|i| |m| (+ |i| 1))) ((> |i| G166971) NIL) (SEQ (EXIT (setq |matform| diff --git a/src/interp/nag-s.lisp.pamphlet b/src/interp/nag-s.lisp.pamphlet index 6d9205d..037f0b2 100644 --- a/src/interp/nag-s.lisp.pamphlet +++ b/src/interp/nag-s.lisp.pamphlet @@ -98,7 +98,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (|linkGen| (STRCONC "s01eaf(complex(" |x| '|,| |y| '|),| (princ-to-string |ifail|) '|)|)))))) @@ -521,7 +521,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (|linkGen| (STRCONC "s14baf(" |a| '|,| |x| '|,| |tol| '|,| (princ-to-string |ifail|) '|)|)))))) @@ -1304,7 +1304,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |prefix| (STRCONC "s17dcf(" |fnu| '|,complex(| |x| '|,| |y| '|),| (princ-to-string |n|))) @@ -1470,7 +1470,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |prefix| (STRCONC "s17def(" |fnu| '|,complex(| |x| '|,| |y| '|),| (princ-to-string |n|))) @@ -1617,7 +1617,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |prefix| (STRCONC "s17dgf(\"" |deriv| '|",complex(| |x| '|,| |y| '|),"|)) @@ -1764,7 +1764,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |prefix| (STRCONC "s17dhf(\"" |deriv| '|",complex(| |x| '|,| |y| '|),"|)) @@ -1953,7 +1953,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |prefix| (STRCONC "s17dlf(" (princ-to-string |m|) '|, | |fnu| '|,complex(|)) @@ -2382,7 +2382,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |prefix| (STRCONC "s18dcf(" |fnu| '|,complex(| |x| '|,| |y| '|),| (princ-to-string |n|))) @@ -2548,7 +2548,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (setq |prefix| (STRCONC "s18def(" |fnu| '|,complex(| |x| '|,| |y| '|),| (princ-to-string |n|))) @@ -3007,7 +3007,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (|linkGen| (STRCONC '|s21baf(| |x| "," |y| '|,| (princ-to-string |ifail|) ")")))))) @@ -3115,7 +3115,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (|linkGen| (STRCONC '|s21bbf(| |x| "," |y| '|,| |z| '|,| (princ-to-string |ifail|) ")")))))) @@ -3222,7 +3222,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (|linkGen| (STRCONC '|s21bcf(| |x| "," |y| '|,| |z| '|,| (princ-to-string |ifail|) ")")))))) @@ -3342,7 +3342,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (|linkGen| (STRCONC '|s21bdf(| |x| "," |y| '|,| |z| '|,| |r| '|,| (princ-to-string |ifail|) ")")))))) @@ -3366,7 +3366,7 @@ (setq |ifail| (COND ((BOOT-EQUAL |error| '|one|) 1) - ('T (SPADDIFFERENCE 1)))) + ('T (- 1)))) (|linkGen| (STRCONC |routine| '|(| |x| "," (princ-to-string |ifail|) ")")))))) diff --git a/src/interp/newfort.lisp.pamphlet b/src/interp/newfort.lisp.pamphlet index 802a103..772ba35 100644 --- a/src/interp/newfort.lisp.pamphlet +++ b/src/interp/newfort.lisp.pamphlet @@ -328,7 +328,7 @@ ((EQL |nargs| 1) (COND ((> (setq |p| (|position| |op| |unaryOps|)) - (SPADDIFFERENCE 1)) + (- 1)) (setq |nprec| (ELT |unaryPrecs| |p|)) (setq |s| (APPEND (|exp2Fort2| (CAR |args|) |nprec| @@ -368,7 +368,7 @@ (setq |arg2| (CAR (CDR |args|))))) (setq |p| (|position| |op| |binaryOps|)) (COND - ((BOOT-EQUAL |p| (SPADDIFFERENCE 1)) + ((BOOT-EQUAL |p| (- 1)) (setq |p| (|position| |op| |naryOps|)) (setq |nprec| (ELT |naryPrecs| |p|))) ('T (setq |nprec| (ELT |binaryPrecs| |p|)))) @@ -826,7 +826,7 @@ (setq |contPref| (STRCONC '| &| (MAKE-STRING - (SPADDIFFERENCE |$fortIndent| 6)))) + (- |$fortIndent| 6)))) (setq |lines| NIL) (setq |ll| |$fortIndent|) (DO () ((NULL |f|) NIL) @@ -854,7 +854,7 @@ (> (+ |ll| |sff|) |$fortLength|)) (setq |spaceLeft| - (SPADDIFFERENCE + (- |$fortLength| |ll|)) (setq |line| (STRCONC |line| @@ -1240,7 +1240,7 @@ (setq |var| (|object2String| |var|)) (setq |si| |$fortranArrayStartingIndex|) (setq |hidim| - (+ (SPADDIFFERENCE (|#| |elts|) 1) |si|)) + (+ (- (|#| |elts|) 1) |si|)) (SEQ (COND ((AND (LISTP (CAR |elts|)) (EQL (|#| |elts|) 1) (PROGN @@ -1323,9 +1323,9 @@ (setq |rows| (QCDR |ISTMP#1|)) 'T)))) (setq |var| (|object2String| |var|)) - (setq |nrows| (SPADDIFFERENCE (|#| |rows|) 1)) + (setq |nrows| (- (|#| |rows|) 1)) (setq |ncols| - (SPADDIFFERENCE (|#| (CDR (CAR |rows|))) 1)) + (- (|#| (CDR (CAR |rows|))) 1)) (setq |si| |$fortranArrayStartingIndex|) (DO ((G166689 |rows| (CDR G166689)) (|r| NIL) (|rx| |si| (+ |rx| 1))) @@ -1568,7 +1568,7 @@ (declare (special |$fortIndent| |$maximumFortranExpressionLength|)) (PROGN (setq |$maximumFortranExpressionLength| - (SPADDIFFERENCE |$maximumFortranExpressionLength| + (- |$maximumFortranExpressionLength| (TIMES 2 |i|))) (setq |$fortIndent| (+ |$fortIndent| (TIMES 2 |i|))))) @@ -1647,7 +1647,7 @@ (DECLARE (SPECIAL |$fortError|)) (RETURN (SEQ (PROGN - (|changeExprLength| (SPADDIFFERENCE 8)) + (|changeExprLength| (- 8)) (setq |$fortError| NIL) (COND ((BOOT-EQUAL (CAR |switch|) 'NULL) @@ -1692,7 +1692,7 @@ (DECLARE (SPECIAL |$fortError|)) (RETURN (SEQ (PROGN - (|changeExprLength| (SPADDIFFERENCE 8)) + (|changeExprLength| (- 8)) (setq |$fortError| NIL) (COND ((AND (LISTP |switch|) @@ -1744,7 +1744,7 @@ (DECLARE (SPECIAL |$fortError|)) (RETURN (SEQ (PROGN - (|changeExprLength| (SPADDIFFERENCE 8)) + (|changeExprLength| (- 8)) (setq |$fortError| NIL) (COND ((AND (LISTP |switch|) @@ -1785,7 +1785,7 @@ (DECLARE (SPECIAL |$fortError|)) (RETURN (SEQ (PROGN - (|changeExprLength| (SPADDIFFERENCE 12)) + (|changeExprLength| (- 12)) (setq |$fortError| NIL) (COND ((AND (LISTP |switch|) @@ -1831,7 +1831,7 @@ (COND ((BOOT-EQUAL |returnType| "void") (setq |asp| (CONS "SUBROUTINE " NIL)) - (|changeExprLength| (setq |l| (SPADDIFFERENCE 11)))) + (|changeExprLength| (setq |l| (- 11)))) ('T (setq |asp| (CONS (setq |s| @@ -1840,14 +1840,14 @@ (CONS " FUNCTION " NIL))) (|changeExprLength| (setq |l| - (SPADDIFFERENCE (SPADDIFFERENCE 10) + (- (- 10) (LENGTH |s|)))))) (|displayLines| (|fortran2Lines| (APPEND |asp| (|statement2Fortran| (CONS |name| (CDADR |args|)))))) - (|changeExprLength| (SPADDIFFERENCE |l|)))))) + (|changeExprLength| (- |l|)))))) ;checkType ty == ; ty := STRING_-UPCASE princ-to-string ty @@ -1999,8 +1999,8 @@ (RETURN (SEQ (PROGN (setq |l| - (SPADDIFFERENCE - (SPADDIFFERENCE + (- + (- |$maximumFortranExpressionLength| 1) (LENGTH |typeName|))) (DO () ((NULL (> (|nameLen| |names|) |l|)) NIL) @@ -2362,7 +2362,7 @@ ('T (CONS "-" (CONS (|fix2FortranFloat| - (SPADDIFFERENCE |e|)) + (- |e|)) NIL))))) ('T |e|))) ((|isFloat| |e|) (|checkPrecision| |e|)) @@ -2450,7 +2450,7 @@ (CONS |binaryExpr| (CONS (|fortPre1| - (NTH (SPADDIFFERENCE |i| 1) + (NTH (- |i| 1) |args|)) NIL))))))) |binaryExpr|) @@ -2751,8 +2751,8 @@ (setq |var| (NTH 1 |e|)) (setq |exprs| (|segment1| (THIRD |e|) - (SPADDIFFERENCE - (SPADDIFFERENCE + (- + (- |$maximumFortranExpressionLength| 1) (|fortExpSize| |var|)))) @@ -2769,8 +2769,8 @@ (CONS "RETURN" NIL))) (setq |exprs| (|segment1| (SECOND |e|) - (SPADDIFFERENCE - (SPADDIFFERENCE + (- + (- |$maximumFortranExpressionLength| 2) (|fortExpSize| (CAR |e|))))) @@ -2814,9 +2814,9 @@ ('T (setq |expressions| NIL) (setq |newE| (CONS (CAR |e|) NIL)) (setq |safeSize| - (SPADDIFFERENCE - (SPADDIFFERENCE |maxSize| - (TIMES (SPADDIFFERENCE (|#| |e|) 1) + (- + (- |maxSize| + (TIMES (- (|#| |e|) 1) (+ (|tempLen|) 1))) (|fortExpSize| |newE|))) (DO ((G167348 (|#| |e|)) (|i| 2 (QSADD1 |i|))) @@ -2824,22 +2824,22 @@ (SEQ (EXIT (PROGN (setq |subSize| (|fortExpSize| - (NTH (SPADDIFFERENCE |i| 1) |e|))) + (NTH (- |i| 1) |e|))) (COND ((<= |subSize| |safeSize|) (setq |safeSize| - (SPADDIFFERENCE |safeSize| + (- |safeSize| |subSize|)) (setq |newE| (APPEND |newE| (CONS - (NTH (SPADDIFFERENCE |i| 1) + (NTH (- |i| 1) |e|) NIL)))) ('T (setq |exprs| (|segment2| - (NTH (SPADDIFFERENCE |i| 1) + (NTH (- |i| 1) |e|) |safeSize|)) (setq |expressions| @@ -2849,7 +2849,7 @@ (APPEND |newE| (CONS (CAR |exprs|) NIL))) (setq |safeSize| - (SPADDIFFERENCE |safeSize| + (- |safeSize| (|fortExpSize| (CAR |exprs|)))))))))) (CONS |newE| |expressions|))))))) @@ -2885,8 +2885,8 @@ (RETURN (SEQ (PROGN (setq |maxSize| - (SPADDIFFERENCE - (SPADDIFFERENCE + (- + (- |$maximumFortranExpressionLength| (|tempLen|)) 1)) @@ -2895,13 +2895,13 @@ ('T (setq |exprs| NIL) (setq |newE| (CONS (CAR |e|) NIL)) (setq |topSize| - (SPADDIFFERENCE |topSize| + (- |topSize| (|fortExpSize| |newE|))) (DO ((G167376 (|#| |e|)) (|i| 2 (QSADD1 |i|))) ((QSGREATERP |i| G167376) NIL) (SEQ (EXIT (PROGN (setq |subE| - (NTH (SPADDIFFERENCE |i| 1) + (NTH (- |i| 1) |e|)) (COND ((> (setq |subSize| @@ -2922,7 +2922,7 @@ (APPEND |newE| (CONS (CAR |subE|) NIL))) (setq |topSize| - (SPADDIFFERENCE |topSize| + (- |topSize| |subSize|))) ('T (setq |newVar| @@ -2937,14 +2937,14 @@ (CONS (CAR |subE|) NIL))) |exprs|)) (setq |topSize| - (SPADDIFFERENCE |topSize| + (- |topSize| (|fortExpSize| |newVar|)))))) ('T (setq |newE| (APPEND |newE| (CONS |subE| NIL))) (setq |topSize| - (SPADDIFFERENCE |topSize| + (- |topSize| |subSize|)))))))) (COND ((> |topSize| 0) (CONS |newE| |exprs|)) diff --git a/src/interp/nruncomp.lisp.pamphlet b/src/interp/nruncomp.lisp.pamphlet index 4bd2e01..7437d4e 100644 --- a/src/interp/nruncomp.lisp.pamphlet +++ b/src/interp/nruncomp.lisp.pamphlet @@ -617,7 +617,7 @@ (CONS |eltOrConst| (CONS '$ (CONS - (SPADDIFFERENCE + (- (+ |$NRTbase| |$NRTdeltaLength|) (COND @@ -1473,7 +1473,7 @@ (setq |$getDomainCode| NIL) (setq |ans| (|minimalise| |ans|)) (SAY (CONS "time taken in buildFunctor: " - (CONS (SPADDIFFERENCE (get-internal-run-time) |oldtime|) + (CONS (- (get-internal-run-time) |oldtime|) NIL))) |ans|))))) @@ -2487,7 +2487,7 @@ (SETQ G167647 (OR G167647 |i|)))))))))) (COND - (|u| (+ (SPADDIFFERENCE |$NRTdeltaLength| |u|) 6)) + (|u| (+ (- |$NRTdeltaLength| |u|) 6)) ('T NIL))))))) ;NRTsubstDelta(initSig) == @@ -2516,7 +2516,7 @@ (IF (EQL |t| 5) (EXIT |$NRTaddForm|)) (setq |u| (ELT |$NRTdeltaList| - (SPADDIFFERENCE + (- (+ |$NRTdeltaLength| 5) |t|))) (IF (BOOT-EQUAL (CAR |u|) '|domain|) (EXIT (CADR |u|))) diff --git a/src/interp/nrunfast.lisp.pamphlet b/src/interp/nrunfast.lisp.pamphlet index b81f9c3..0123472 100644 --- a/src/interp/nrunfast.lisp.pamphlet +++ b/src/interp/nrunfast.lisp.pamphlet @@ -677,8 +677,8 @@ (|systemError| "limit too large"))) (setq |numArgs| (COND - ((|hashCode?| |sig|) (SPADDIFFERENCE 1)) - ('T (SPADDIFFERENCE (|#| |sig|) 1)))) + ((|hashCode?| |sig|) (- 1)) + ('T (- (|#| |sig|) 1)))) (setq |success| NIL) (setq |$isDefaultingPackage| (AND (NEQUAL |dollar| |domain|) diff --git a/src/interp/nrungo.lisp.pamphlet b/src/interp/nrungo.lisp.pamphlet index 74be92a..9ab8d14 100644 --- a/src/interp/nrungo.lisp.pamphlet +++ b/src/interp/nrungo.lisp.pamphlet @@ -860,7 +860,7 @@ (setq G166619 NIL) (RETURN (DO ((G166627 NIL G166619) - (G166628 (SPADDIFFERENCE |s| 1)) + (G166628 (- |s| 1)) (|k| 0 (QSADD1 |k|)) (G166629 |$minivector| (CDR G166629)) @@ -1157,7 +1157,7 @@ (RETURN (DO ((G167128 NIL (NULL G167121)) (G167129 - (SPADDIFFERENCE + (- (+ |minIndex| |n|) 1)) (|i| |minIndex| (+ |i| 1)) (G167130 |specialValues| @@ -1493,14 +1493,14 @@ (setq |result| (CONS |body| (CONS |sharpArg| - (CONS (SPADDIFFERENCE |n| 1) + (CONS (- |n| 1) (NREVERSE (PROG (G167180) (setq G167180 NIL) (RETURN (DO ((G167185 - (SPADDIFFERENCE |n| 1)) + (- |n| 1)) (|i| |minIndex| (+ |i| 1))) ((> |i| G167185) @@ -1575,7 +1575,7 @@ (PROGN (setq |ISTMP#1| (ELT |argl| - (SPADDIFFERENCE |sharpPosition| + (- |sharpPosition| 1))) (AND (CONSP |ISTMP#1|) (EQ (QCAR |ISTMP#1|) 'SPADCALL) diff --git a/src/interp/nrunopt.lisp.pamphlet b/src/interp/nrunopt.lisp.pamphlet index e140b18..02cfa18 100644 --- a/src/interp/nrunopt.lisp.pamphlet +++ b/src/interp/nrunopt.lisp.pamphlet @@ -107,7 +107,7 @@ (setq |whereToGo| (CADR |item|)) (setq |op| (CADDR |item|)) (setq |flag| (CDDDR |item|)) - (setq |n| (SPADDIFFERENCE (|#| |sig|) 1)) + (setq |n| (- (|#| |sig|) 1)) (setq |newcode| (CONS |n| (CONS |whereToGo| @@ -245,7 +245,7 @@ (setq |r| (CDR |y|)) |y|) (IF (BOOT-EQUAL |r| (CONS '|Subsumed| NIL)) - (EXIT (SEQ (setq |n| (SPADDIFFERENCE (|#| |sig|) 1)) + (EXIT (SEQ (setq |n| (- (|#| |sig|) 1)) (setq |$byteAddress| (+ (+ |$byteAddress| |n|) 4)) (EXIT (CONS |n| @@ -277,7 +277,7 @@ (|predicateBitIndex| |pred|))) (EXIT 0))))) NIL) - (IF (BOOT-EQUAL |predCode| (SPADDIFFERENCE 1)) + (IF (BOOT-EQUAL |predCode| (- 1)) (EXIT (RETURN NIL))) (IF (NULL |slot|) (SEQ (IF (BOOT-EQUAL |$lookupFunction| @@ -285,7 +285,7 @@ (EXIT (RETURN NIL))) (EXIT (setq |slot| 1))) NIL) - (setq |n| (SPADDIFFERENCE (|#| |sig|) 1)) + (setq |n| (- (|#| |sig|) 1)) (setq |$byteAddress| (+ (+ |$byteAddress| |n|) 4)) (setq |res| (CONS |n| @@ -786,7 +786,7 @@ (SEQ (EXIT (COND ((NEQUAL (setq |k| (|predicateBitIndex| |b|)) - (SPADDIFFERENCE 1)) + (- 1)) (SETQ G166590 (CONS (CONS |a| |k|) G166590))))))))))))) @@ -806,7 +806,7 @@ (RETURN (SEQ (setq |u| (|simpBool| (|transHasCode| |x|))) (IF (BOOT-EQUAL |u| 'T) (EXIT 0)) - (IF (NULL |u|) (EXIT (SPADDIFFERENCE 1))) + (IF (NULL |u|) (EXIT (- 1))) (IF (setq |p| (POSN1 |u| |$NRTslot1PredicateList|)) (EXIT (+ |p| 1))) (IF (NULL |flag|) @@ -1333,7 +1333,7 @@ ; LOGBITP(i - 1,vec) (DEFUN |testBitVector| (|vec| |i|) - (COND ((EQ |i| 0) 'T) ('T (LOGBITP (SPADDIFFERENCE |i| 1) |vec|)))) + (COND ((EQ |i| 0) 'T) ('T (LOGBITP (- |i| 1) |vec|)))) ;bitsOf n == ; n = 0 => 0 @@ -1459,7 +1459,7 @@ ((NEQUAL (setq |k| (|predicateBitIndex| |b|)) - (SPADDIFFERENCE 1)) + (- 1)) (SETQ G167076 (CONS (CONS |a| |k|) G167076)))))))))) @@ -2075,7 +2075,7 @@ (CONS (STRCONC "#" (princ-to-string - (SPADDIFFERENCE |i| 5))) + (- |i| 5))) NIL)))) ((ATOM |item|) (|sayBrightly| @@ -2248,7 +2248,7 @@ (COND ((NULL |val|) (CONS (STRCONC "#" - (princ-to-string (SPADDIFFERENCE |x| 5))) + (princ-to-string (- |x| 5))) NIL)) ('T (|formatSlotDomain| |val|)))) ((ATOM |x|) |x|) @@ -2370,7 +2370,7 @@ (APPEND (|bright| "if") (|pred2English| (ELT |$predvec| - (SPADDIFFERENCE |predNumber| 1))))))) + (- |predNumber| 1))))))) (setq |namePart| (|bright| (COND @@ -2471,7 +2471,7 @@ (|bright| "if") (|pred2English| (ELT |$predvec| - (SPADDIFFERENCE |predNumber| + (- |predNumber| 1))))))) (|sayBrightly| (CONS |a| |suffix|))))))))))) @@ -2529,7 +2529,7 @@ "if") (|pred2English| (ELT |$predvec| - (SPADDIFFERENCE + (- |predNumber| 1))))))) (setq |extra| (COND @@ -2591,7 +2591,7 @@ (|bright| "if") (|pred2English| (ELT |$predvec| - (SPADDIFFERENCE |predNumber| + (- |predNumber| 1))))))) (setq |extra| (COND diff --git a/src/interp/parsing.lisp.pamphlet b/src/interp/parsing.lisp.pamphlet index e514ae6..3b75f02 100644 --- a/src/interp/parsing.lisp.pamphlet +++ b/src/interp/parsing.lisp.pamphlet @@ -602,7 +602,7 @@ foo defined inside of fum gets renamed as fum,foo.") (|first| CAR) (|rest| CDR) (|substitute| MSUBST) (|removeDuplicates| REMDUP) (|reverse| REVERSE) (|nreverse| NREVERSE) (|drop| DROP) (|take| TAKE) (|croak| CROAK) (|genvar| GENVAR) - (|mkpf| MKPF) (^= NEQUAL) (= EQUAL) (- SPADDIFFERENCE) + (|mkpf| MKPF) (^= NEQUAL) (= EQUAL) (* TIMES) (/ QUOTIENT) (** EXPT) (|return| RETURN) (|exit| EXIT) (\| SUCHTHAT) (^ NULL) (|not| NULL) (NOT NULL) (REDUCE spadReduce) (DO spadDo) @@ -1300,7 +1300,7 @@ parse ((EQL |n| 1) |form|) ('T (setq |argKey| (ELT |sop| 1)) (setq |numArgs| - (SPADDIFFERENCE (|#| |argl|) + (- (|#| |argl|) (COND ((BOOT-EQUAL |argKey| '|1|) 1) ('T 0)))) @@ -1398,7 +1398,7 @@ parse ((BOOT-EQUAL |argKey| '|0|) |argl|) ('T - (DROP (SPADDIFFERENCE 1) + (DROP (- 1) |argl|)))) (COND ((AND (> 10 |numArgs|) diff --git a/src/interp/record.lisp.pamphlet b/src/interp/record.lisp.pamphlet index 35bfc90..4a84874 100644 --- a/src/interp/record.lisp.pamphlet +++ b/src/interp/record.lisp.pamphlet @@ -638,9 +638,9 @@ (CONS (|char| '|f|) (CONS (|char| '|b|) NIL))) (EXIT (SUBSTRING |s| |init| - (SPADDIFFERENCE |k| |init|)))) + (- |k| |init|)))) (EXIT (STRCONC (SUBSTRING |s| |init| - (SPADDIFFERENCE |k| |init|)) + (- |k| |init|)) (|htCommandToInputLine,fn| |s| (+ |k| 1))))))) (EXIT (SUBSTRING |s| |init| NIL)))))) @@ -680,7 +680,7 @@ (CONS (|char| '|b|) NIL)))) (SETQ G166422 (OR G166422 |i|)))))))))) - (SUBSTRING |s| 0 (SPADDIFFERENCE |k| 1))) + (SUBSTRING |s| 0 (- |k| 1))) ('T |s|))))))) ;htMkPath(directory,name,typ) == diff --git a/src/interp/slam.lisp.pamphlet b/src/interp/slam.lisp.pamphlet index df029fb..f10a104 100644 --- a/src/interp/slam.lisp.pamphlet +++ b/src/interp/slam.lisp.pamphlet @@ -993,7 +993,7 @@ (setq |phrase4| (CONS (CONS 'GT (CONS |sharpArg| - (CONS (SPADDIFFERENCE |n| |k|) + (CONS (- |n| |k|) NIL))) (CONS (CONS 'ELT diff --git a/src/interp/sys-pkg.lisp.pamphlet b/src/interp/sys-pkg.lisp.pamphlet index 3b2ef9f..1c22d82 100644 --- a/src/interp/sys-pkg.lisp.pamphlet +++ b/src/interp/sys-pkg.lisp.pamphlet @@ -195,7 +195,7 @@ provides support for compiler code. BOOT::|$constructorsNotInDatabase| BOOT::|$ConstructorNames| BOOT::|$Integer| BOOT::|$systemModemapsInCore| BOOT::KADDR BOOT::STAR BOOT::|$reportCompilation| - BOOT::|$traceNoisely| BOOT::SPADDIFFERENCE BOOT::%B + BOOT::|$traceNoisely| BOOT::%B BOOT::COMMENT-CHARACTER BOOT::|$PrettyPrint| BOOT::SPADLET BOOT::|$ModemapFrame| BOOT::|$QuickLet| BOOT::SPADDO BOOT::PREDECESSOR BOOT::*EOF* BOOT::POP-STACK-1 BOOT::BANG diff --git a/src/interp/template.lisp.pamphlet b/src/interp/template.lisp.pamphlet index 0c70080..4aa8d2f 100644 --- a/src/interp/template.lisp.pamphlet +++ b/src/interp/template.lisp.pamphlet @@ -420,7 +420,7 @@ (+ |code| 2))) ('T (setq |dcIndex| - (SPADDIFFERENCE + (- |dcIndex|)))) (COND ((BOOT-EQUAL |flag| 'CONST) @@ -616,7 +616,7 @@ (SETELT |$predVector| |$predVectorFrontier| |pred|) (setq |$predVectorFrontier| (+ |$predVectorFrontier| 1)) - (SPADDIFFERENCE |$predVectorFrontier| 1)))))))) + (- |$predVectorFrontier| 1)))))))) ;extendVectorSize v == ; n:= MAXINDEX v @@ -1154,7 +1154,7 @@ (+ G166901 (|measureCommon,fn| (ELT |u| |i|) 0)))))))))) - (IF (SPADDIFFERENCE (SPADDIFFERENCE HASH TABLE) + (IF (- (- HASH TABLE) (P |u|)) (EXIT (PROG (G166910) (setq G166910 0) diff --git a/src/interp/topics.lisp.pamphlet b/src/interp/topics.lisp.pamphlet index f6d4c9a..41507ba 100644 --- a/src/interp/topics.lisp.pamphlet +++ b/src/interp/topics.lisp.pamphlet @@ -153,7 +153,7 @@ (READLINE |instream|))))) (setq |m| (MAXINDEX |line|)) (COND - ((BOOT-EQUAL |m| (SPADDIFFERENCE 1)) + ((BOOT-EQUAL |m| (- 1)) '|skip|) ((BOOT-EQUAL (ELT |line| 0) (|char| '-)) '|skip|) @@ -258,7 +258,7 @@ (DEFUN |blankLine?| (|line|) (PROG () (RETURN - (SEQ (OR (BOOT-EQUAL (MAXINDEX |line|) (SPADDIFFERENCE 1)) + (SEQ (OR (BOOT-EQUAL (MAXINDEX |line|) (- 1)) (PROG (G166191) (setq G166191 'T) (RETURN @@ -300,7 +300,7 @@ (CONS (INTERN (SUBSTRING |s| |k| - (+ (SPADDIFFERENCE |k|) + (+ (- |k|) (setq |k| (|charPosition| (|char| '| |) |s| diff --git a/src/interp/vmlisp.lisp.pamphlet b/src/interp/vmlisp.lisp.pamphlet index 2854922..7686325 100644 --- a/src/interp/vmlisp.lisp.pamphlet +++ b/src/interp/vmlisp.lisp.pamphlet @@ -2999,8 +2999,6 @@ LP (COND ((NULL X) ; 12.4 Arithmetic Operations -(defmacro SPADDIFFERENCE (&rest x) `(- . ,x)) - ; 12.5 Irrational and Transcendental Functions ; 12.5.1 Exponential and Logarithmic Functions @@ -3769,7 +3767,7 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size (RETURN (SEQ (COND ((> 1 N) NIL) - ('T (SPADLET |l| (SPADDIFFERENCE (|#| |str|) 1)) + ('T (SPADLET |l| (- (|#| |str|) 1)) (COND ((EQL |l| 0) NIL) ('T (SPADLET |n| 0) (SPADLET |word| '||) @@ -5414,7 +5412,6 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" (** EXPT) (^ NULL) (^= NEQUAL) - (- SPADDIFFERENCE) (/ QUOTIENT) (= EQUAL) (ASSOC |assoc|) -- 1.7.5.4