diff --git a/books/bookvol10.2.pamphlet b/books/bookvol10.2.pamphlet index f423e2b..1b82f31 100644 --- a/books/bookvol10.2.pamphlet +++ b/books/bookvol10.2.pamphlet @@ -76768,7 +76768,7 @@ Note that this code is not included in the generated catdef.spad file. |AbelianGroup|) (SETELT #1# 0 (QUOTE (|AbelianGroup|))))))) -(MAKEPROP (QUOTE |AbelianGroup|) (QUOTE NILADIC) T) +(setf (get (quote |AbelianGroup|) (quote niladic)) t) \end{chunk} \section{ABELGRP-.lsp BOOTSTRAP} @@ -76819,9 +76819,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |ABELGRP-;*;I2S;4|) |$|)))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |AbelianGroup&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -76910,7 +76910,7 @@ Note that this code is not included in the generated catdef.spad file. |AbelianMonoid|) (SETELT #1# 0 (QUOTE (|AbelianMonoid|))))))) -(MAKEPROP (QUOTE |AbelianMonoid|) (QUOTE NILADIC) T) +(setf (get (QUOTE |AbelianMonoid|) (QUOTE NILADIC)) T) \end{chunk} \section{ABELMON-.lsp BOOTSTRAP} @@ -76970,9 +76970,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 18 (CONS (|dispatchFunction| |ABELMON-;*;Nni2S;4|) |$|)))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |AbelianMonoid&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -77055,7 +77055,7 @@ Note that this code is not included in the generated catdef.spad file. |AbelianSemiGroup|) (SETELT #1# 0 (QUOTE (|AbelianSemiGroup|))))))) -(MAKEPROP (QUOTE |AbelianSemiGroup|) (QUOTE NILADIC) T) +(setf (get (QUOTE |AbelianSemiGroup|) (QUOTE NILADIC)) T) \end{chunk} \section{ABELSG-.lsp BOOTSTRAP} {\bf ABELSG-} needs @@ -77103,9 +77103,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |ABELSG-;*;Pi2S;1|) |$|)))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |AbelianSemiGroup&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -77248,7 +77248,7 @@ Note that this code is not included in the generated catdef.spad file. |CancellationAbelianMonoid|) (SETELT #1# 0 (QUOTE (|CancellationAbelianMonoid|))))))) -(MAKEPROP (QUOTE |CancellationAbelianMonoid|) (QUOTE NILADIC) T) +(setf (get (QUOTE |CancellationAbelianMonoid|) (QUOTE NILADIC)) T) \end{chunk} \section{CLAGG.lsp BOOTSTRAP} @@ -77518,9 +77518,9 @@ Note that this code is not included in the generated catdef.spad file. |$|)))))))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |Collection&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (|List| 7) (0 . |parts|) (|NonNegativeInteger|) (5 . |#|) (|Mapping| 14 7) @@ -77589,7 +77589,7 @@ Note that this code is not included in the generated catdef.spad file. |CommutativeRing|) (SETELT #1# 0 (QUOTE (|CommutativeRing|))))))) -(MAKEPROP (QUOTE |CommutativeRing|) (QUOTE NILADIC) T) +(setf (get (QUOTE |CommutativeRing|) (QUOTE NILADIC)) T) \end{chunk} \section{DIFRING.lsp BOOTSTRAP} @@ -77634,7 +77634,7 @@ Note that this code is not included in the generated catdef.spad file. |DifferentialRing|) (SETELT #1# 0 (QUOTE (|DifferentialRing|))))))) -(MAKEPROP (QUOTE |DifferentialRing|) (QUOTE NILADIC) T) +(setf (get (QUOTE |DifferentialRing|) (QUOTE NILADIC)) T) \end{chunk} \section{DIFRING-.lsp BOOTSTRAP} @@ -77689,9 +77689,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |DifferentialRing&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -77762,7 +77762,7 @@ Note that this code is not included in the generated catdef.spad file. |DivisionRing|) (SETELT #1# 0 (QUOTE (|DivisionRing|))))))) -(MAKEPROP (QUOTE |DivisionRing|) (QUOTE NILADIC) T) +(setf (get (QUOTE |DivisionRing|) (QUOTE NILADIC)) T) \end{chunk} \section{DIVRING-.lsp BOOTSTRAP} @@ -77816,9 +77816,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |DivisionRing&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -77969,7 +77969,7 @@ Note that this code is not included in the generated catdef.spad file. |ExpressionSpace|) (SETELT #1# 0 (QUOTE (|ExpressionSpace|))))))) -(MAKEPROP (QUOTE |ExpressionSpace|) (QUOTE NILADIC) T) +(setf (get (QUOTE |ExpressionSpace|) (QUOTE NILADIC)) T) \end{chunk} \section{ES-.lsp BOOTSTRAP} {\bf ES-} depends on {\bf ES}. We need to break this cycle to build @@ -78666,9 +78666,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 128 (CONS (|dispatchFunction| |ES-;odd?;SB;44|) |$|))))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |ExpressionSpace&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #( NIL NIL NIL NIL NIL NIL (|local| |#1|) (|String|) (|Symbol|) @@ -78855,9 +78855,9 @@ If this function has never been called before we call the (SETELT #1# 0 (QUOTE (|EuclideanDomain|))))))) \end{chunk} -\subsubsection{EUCDOM;MAKEPROP} -\begin{chunk}{EUCDOM;MAKEPROP} -(MAKEPROP (QUOTE |EuclideanDomain|) (QUOTE NILADIC) T) +\subsubsection{EUCDOM;NILADIC} +\begin{chunk}{EUCDOM;NILADIC} +(setf (get (QUOTE |EuclideanDomain|) (QUOTE NILADIC)) T) \end{chunk} \begin{chunk}{EUCDOM.lsp BOOTSTRAP} @@ -78865,7 +78865,7 @@ If this function has never been called before we call the \getchunk{EuclideanDomain;AL} \getchunk{EuclideanDomain} \getchunk{EuclideanDomain;} -\getchunk{EUCDOM;MAKEPROP} +\getchunk{EUCDOM;NILADIC} \end{chunk} \section{EUCDOM-.lsp BOOTSTRAP} {\bf EUCDOM-} depends on {\bf EUCDOM}. We need to break this cycle to build @@ -79348,11 +79348,11 @@ recompiling. $)))) \end{chunk} -\subsubsection{EUCDOM-;MAKEPROP} -\begin{chunk}{EUCDOM-;MAKEPROP} -(MAKEPROP +\subsubsection{EUCDOM-;INFOVEC} +\begin{chunk}{EUCDOM-;INFOVEC} +(setf (get (QUOTE |EuclideanDomain&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|Boolean|) (0 . |zero?|) (|NonNegativeInteger|) (5 . |euclideanSize|) |EUCDOM-;sizeLess?;2SB;1| @@ -79407,7 +79407,7 @@ recompiling. \getchunk{EUCDOM-;expressIdealMember;LSU;10} \getchunk{EUCDOM-;multiEuclidean;LSU;11} \getchunk{EuclideanDomainAmp} -\getchunk{EUCDOM-;MAKEPROP} +\getchunk{EUCDOM-;INFOVEC} \end{chunk} \section{ENTIRER.lsp BOOTSTRAP} {\bf ENTIRER} depends on itself. We need to break this cycle to build @@ -79447,7 +79447,7 @@ Note that this code is not included in the generated catdef.spad file. |EntireRing|) (SETELT #1# 0 (QUOTE (|EntireRing|))))))) -(MAKEPROP (QUOTE |EntireRing|) (QUOTE NILADIC) T) +(setf (get (QUOTE |EntireRing|) (QUOTE NILADIC)) T) \end{chunk} \section{FFIELDC.lsp BOOTSTRAP} @@ -79516,7 +79516,7 @@ Note that this code is not included in the generated catdef.spad file. |FiniteFieldCategory|) (SETELT #1# 0 (QUOTE (|FiniteFieldCategory|))))))) -(MAKEPROP (QUOTE |FiniteFieldCategory|) (QUOTE NILADIC) T) +(setf (get (QUOTE |FiniteFieldCategory|) (QUOTE NILADIC)) T) \end{chunk} \section{FFIELDC-.lsp BOOTSTRAP} @@ -80020,9 +80020,9 @@ Note that this code is not included in the generated catdef.spad file. (|stuffDomainSlots| |$|) (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |FiniteFieldCategory&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |Zero|) @@ -80148,7 +80148,7 @@ Note that this code is not included in the generated catdef.spad file. |FloatingPointSystem|) (SETELT #1# 0 (QUOTE (|FloatingPointSystem|))))))) -(MAKEPROP (QUOTE |FloatingPointSystem|) (QUOTE NILADIC) T) +(setf (get (QUOTE |FloatingPointSystem|) (QUOTE NILADIC)) T) \end{chunk} \section{FPS-.lsp BOOTSTRAP} @@ -80200,9 +80200,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |FloatingPointSystem&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -80291,7 +80291,7 @@ Note that this code is not included in the generated catdef.spad file. |GcdDomain|) (SETELT #1# 0 (QUOTE (|GcdDomain|))))))) -(MAKEPROP (QUOTE |GcdDomain|) (QUOTE NILADIC) T) +(setf (get (QUOTE |GcdDomain|) (QUOTE NILADIC)) T) \end{chunk} \section{GCDDOM-.lsp BOOTSTRAP} @@ -80501,9 +80501,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |GcdDomain&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -80906,9 +80906,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |HOAGG-;coerce;AOf;10|) |$|)))))))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |HomogeneousAggregate&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (|List| 37) (0 . |eval|) (|Mapping| 7 7) (6 . |map|) (12 . |eval|) (|List| 7) @@ -81017,7 +81017,7 @@ This is eventually forcibly replaced by a recompiled version. |IntegerNumberSystem|) (SETELT #0# 0 (QUOTE (|IntegerNumberSystem|))))))) -(MAKEPROP (QUOTE |IntegerNumberSystem|) (QUOTE NILADIC) T) +(setf (get (QUOTE |IntegerNumberSystem|) (QUOTE NILADIC)) T) \end{chunk} \section{INS-.lsp BOOTSTRAP} @@ -81302,9 +81302,9 @@ This is eventually forcibly replaced by a recompiled version. (QSETREFV $ 6 |#1|) $)))) -(MAKEPROP +(setf (get (QUOTE |IntegerNumberSystem&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -81470,7 +81470,7 @@ Note that this code is not included in the generated catdef.spad file. |IntegralDomain|) (SETELT #1# 0 (QUOTE (|IntegralDomain|))))))) -(MAKEPROP (QUOTE |IntegralDomain|) (QUOTE NILADIC) T) +(setf (get (QUOTE |IntegralDomain|) (QUOTE NILADIC)) T) \end{chunk} \section{INTDOM-.lsp BOOTSTRAP} @@ -81544,9 +81544,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |INTDOM-;associates?;2SB;6|) |$|)))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |IntegralDomain&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -81730,9 +81730,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |LNAGG-;maxIndex;AI;6|) |$|)))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |LinearAggregate&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (|Integer|) (0 . |minIndex|) (5 . |maxIndex|) (|List| 8) |LNAGG-;indices;AL;1| @@ -82620,9 +82620,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 64 (CONS (|dispatchFunction| |LSAGG-;<;2AB;25|) |$|)))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |ListAggregate&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (|NonNegativeInteger|) (0 . |#|) (|Mapping| 15 7 7) |LSAGG-;sort!;M2A;1| @@ -82711,7 +82711,7 @@ Note that this code is not included in the generated catdef.spad file. |Monoid|) (SETELT #1# 0 (QUOTE (|Monoid|))))))) -(MAKEPROP (QUOTE |Monoid|) (QUOTE NILADIC) T) +(setf (get (QUOTE |Monoid|) (QUOTE NILADIC)) T) \end{chunk} \section{MONOID-.lsp BOOTSTRAP} @@ -82759,9 +82759,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |Monoid&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -82923,7 +82923,7 @@ Note that this code is not included in the generated catdef.spad file. (|Join| (|IntegralDomain|) (|OrderedRing|)) |OrderedIntegralDomain|) (SETELT #1# 0 (QUOTE (|OrderedIntegralDomain|))))))) -(MAKEPROP (QUOTE |OrderedIntegralDomain|) (QUOTE NILADIC) T) +(setf (get (QUOTE |OrderedIntegralDomain|) (QUOTE NILADIC)) T) \end{chunk} \section{ORDRING.lsp BOOTSTRAP} @@ -82974,7 +82974,7 @@ Note that this code is not included in the generated catdef.spad file. |OrderedRing|) (SETELT #1# 0 (QUOTE (|OrderedRing|))))))) -(MAKEPROP (QUOTE |OrderedRing|) (QUOTE NILADIC) T) +(setf (get (QUOTE |OrderedRing|) (QUOTE NILADIC)) T) \end{chunk} \section{ORDRING-.lsp BOOTSTRAP} @@ -83025,9 +83025,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |OrderedRing&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -84580,9 +84580,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |POLYCAT-;convert;SIf;43|) $)))))) $)))) -(MAKEPROP +(setf (get (QUOTE |PolynomialCategory&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (|local| |#3|) (|local| |#4|) (|Equation| 6) (0 . |lhs|) (|Union| 9 (QUOTE "failed")) @@ -85610,9 +85610,9 @@ Note that this code is not included in the generated catdef.spad file. |$|))))))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |PolynomialSetCategory&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (|local| |#3|) @@ -86095,9 +86095,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 98 (CONS (|dispatchFunction| |QFCAT-;random;A;26|) |$|)))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |QuotientFieldCategory&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (0 . |numer|) (5 . |coerce|) |QFCAT-;numerator;2A;1| (10 . |denom|) @@ -86287,9 +86287,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 18 (CONS (|dispatchFunction| |RCAGG-;child?;2AB;3|) |$|)))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |RecursiveAggregate&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (0 . |value|) (QUOTE "value") |RCAGG-;elt;AvalueS;1| (5 . |setvalue!|) @@ -86348,7 +86348,7 @@ Note that this code is not included in the generated catdef.spad file. |Ring|) (SETELT #1# 0 (QUOTE (|Ring|))))))) -(MAKEPROP (QUOTE |Ring|) (QUOTE NILADIC) T) +(setf (get (QUOTE |Ring|) (QUOTE NILADIC)) T) \end{chunk} \section{RING-.lsp BOOTSTRAP} @@ -86380,9 +86380,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |Ring&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -86433,7 +86433,7 @@ Note that this code is not included in the generated catdef.spad file. (LETT #1# (|Join| (|AbelianGroup|) (|SemiGroup|)) |Rng|) (SETELT #1# 0 (QUOTE (|Rng|))))))) -(MAKEPROP (QUOTE |Rng|) (QUOTE NILADIC) T) +(setf (get (QUOTE |Rng|) (QUOTE NILADIC)) T) \end{chunk} \section{RNS.lsp BOOTSTRAP} @@ -86498,7 +86498,7 @@ Note that this code is not included in the generated catdef.spad file. |RealNumberSystem|) (SETELT #1# 0 (QUOTE (|RealNumberSystem|))))))) -(MAKEPROP (QUOTE |RealNumberSystem|) (QUOTE NILADIC) T) +(setf (get (QUOTE |RealNumberSystem|) (QUOTE NILADIC)) T) \end{chunk} \section{RNS-.lsp BOOTSTRAP} @@ -86638,9 +86638,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |RealNumberSystem&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -86821,9 +86821,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 7 |#2|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |SetAggregate&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (0 . |difference|) (6 . |union|) |SETAGG-;symmetricDifference;3A;1| @@ -86897,7 +86897,7 @@ Note that this code is not included in the generated catdef.spad file. |SetCategory|) (SETELT #1# 0 (QUOTE (|SetCategory|))))))) -(MAKEPROP (QUOTE |SetCategory|) (QUOTE NILADIC) T) +(setf (get (QUOTE |SetCategory|) (QUOTE NILADIC)) T) \end{chunk} \section{SETCAT-.lsp BOOTSTRAP} @@ -86941,9 +86941,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |SetCategory&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -87305,9 +87305,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |STAGG-;concat!;3A;13|) |$|))))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |StreamAggregate&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (|Boolean|) (0 . |cyclic?|) |STAGG-;explicitlyFinite?;AB;1| @@ -88391,9 +88391,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |TSETCAT-;coHeight;SNni;39|) $)))) $)))) -(MAKEPROP +(setf (get (QUOTE |TriangularSetCategory&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (|local| |#3|) (|local| |#4|) (|local| |#5|) (|Boolean|) (0 . |empty?|) @@ -88540,7 +88540,7 @@ Note that this code is not included in the generated catdef.spad file. |UniqueFactorizationDomain|) (SETELT #1# 0 (QUOTE (|UniqueFactorizationDomain|))))))) -(MAKEPROP (QUOTE |UniqueFactorizationDomain|) (QUOTE NILADIC) T) +(setf (get (QUOTE |UniqueFactorizationDomain|) (QUOTE NILADIC)) T) \end{chunk} \section{UFD-.lsp BOOTSTRAP} @@ -88622,9 +88622,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV |$| 6 |#1|) |$|)))) -(MAKEPROP +(setf (get (QUOTE |UniqueFactorizationDomain&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -90023,9 +90023,9 @@ Note that this code is not included in the generated catdef.spad file. (|dispatchFunction| |UPOLYC-;integrate;2S;53|) |$|)))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |UnivariatePolynomialCategory&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -91009,9 +91009,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |URAGG-;cycleSplit!;2A;33|) |$|))))) |$|)))) -(MAKEPROP +(setf (get (QUOTE |UnaryRecursiveAggregate&|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) (0 . |first|) (QUOTE "first") |URAGG-;elt;AfirstS;1| (5 . |last|) diff --git a/books/bookvol10.3.pamphlet b/books/bookvol10.3.pamphlet index 3829d1c..6b72ef7 100644 --- a/books/bookvol10.3.pamphlet +++ b/books/bookvol10.3.pamphlet @@ -145865,9 +145865,9 @@ This is eventually forcibly replaced by a recompiled version. (|stuffDomainSlots| $) $)))) -(MAKEPROP +(setf (get (QUOTE |Boolean|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL @@ -145941,7 +145941,7 @@ This is eventually forcibly replaced by a recompiled version. 0 6 0 0 1 2 0 6 0 0 22 2 0 0 0 0 14)))))) (QUOTE |lookupComplete|))) -(MAKEPROP (QUOTE |Boolean|) (QUOTE NILADIC) T) +(setf (get (QUOTE |Boolean|) (QUOTE NILADIC)) T) \end{chunk} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -146089,7 +146089,7 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV $ 11 0) $))))) -(MAKEPROP (QUOTE |Character|) (QUOTE |infovec|) +(setf (get (QUOTE |Character|) (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (QUOTE |Rep|) (|List| 28) (|PrimitiveArray| 28) (0 . |construct|) (QUOTE |OutChars|) (QUOTE |minChar|) (|Boolean|) @@ -146128,7 +146128,7 @@ Note that this code is not included in the generated catdef.spad file. 1 2 0 12 0 0 1 2 0 12 0 0 13 2 0 12 0 0 1 2 0 12 0 0 14)))))) (QUOTE |lookupComplete|))) -(MAKEPROP (QUOTE |Character|) (QUOTE NILADIC) T) +(setf (get (QUOTE |Character|) (QUOTE NILADIC)) T) \end{chunk} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{DFLOAT.lsp BOOTSTRAP} @@ -146779,9 +146779,9 @@ Note that this code is not included in the generated catdef.spad file. (|stuffDomainSlots| $) $)))) -(MAKEPROP +(setf (get (QUOTE |DoubleFloat|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|OpenMathEncoding|) (0 . |OMencodingXML|) (|String|) (|OpenMathDevice|) (4 . |OMopenString|) (|Void|) @@ -146927,7 +146927,7 @@ Note that this code is not included in the generated catdef.spad file. 24 0 49 2 0 0 104 0 1 2 0 0 22 0 29)))))) (QUOTE |lookupComplete|))) -(MAKEPROP (QUOTE |DoubleFloat|) (QUOTE NILADIC) T) +(setf (get (QUOTE |DoubleFloat|) (QUOTE NILADIC)) T) \end{chunk} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{ILIST.lsp BOOTSTRAP} @@ -147450,9 +147450,9 @@ Note that this code is not included in the generated catdef.spad file. $)))) $)))) -(MAKEPROP +(setf (get (QUOTE |IndexedList|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #( NIL NIL NIL NIL NIL NIL (|local| |#1|) (|local| |#2|) @@ -147917,9 +147917,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV $ 68 (CONS (|dispatchFunction| |INT;*;3$;39|) $))) $)))) -(MAKEPROP +(setf (get (QUOTE |Integer|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|Void|) (|OpenMathDevice|) (0 . |OMputApp|) @@ -148058,7 +148058,7 @@ Note that this code is not included in the generated catdef.spad file. 2 0 0 11 0 69 2 0 0 70 0 1 2 0 0 128 0 1)))))) (QUOTE |lookupComplete|))) -(MAKEPROP (QUOTE |Integer|) (QUOTE NILADIC) T) +(setf (get (QUOTE |Integer|) (QUOTE NILADIC)) T) \end{chunk} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{ISTRING.lsp BOOTSTRAP} @@ -148854,7 +148854,7 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV $ 6 |#1|) $)))) -(MAKEPROP '|IndexedString| '|infovec| +(setf (get '|IndexedString| '|infovec|) (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|NonNegativeInteger|) (|Character|) |ISTRING;new;NniC$;1| |ISTRING;empty;$;2| (|Boolean|) |ISTRING;empty?;$B;3| @@ -149231,9 +149231,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |LIST;convert;$If;13|) $)))) $)))) -(MAKEPROP +(setf (get (QUOTE |List|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #( NIL NIL NIL NIL NIL (|IndexedList| 6 (NRTEVAL 1)) (|local| |#1|) @@ -149365,9 +149365,9 @@ Note that this code is not included in the generated catdef.spad file. (|stuffDomainSlots| $) $)))) -(MAKEPROP +(setf (get (QUOTE |NonNegativeInteger|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL @@ -149429,7 +149429,7 @@ Note that this code is not included in the generated catdef.spad file. 11 0 1 2 0 0 13 0 1)))))) (QUOTE |lookupComplete|))) -(MAKEPROP (QUOTE |NonNegativeInteger|) (QUOTE NILADIC) T) +(setf (get (QUOTE |NonNegativeInteger|) (QUOTE NILADIC)) T) \end{chunk} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -150010,9 +150010,9 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV $ 6 (|List| $)) $)))) -(MAKEPROP +(setf (get (QUOTE |OutputForm|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #( NIL NIL NIL NIL NIL NIL (QUOTE |Rep|) (|Void|) |OUTFORM;print;$V;1| @@ -150110,7 +150110,7 @@ Note that this code is not included in the generated catdef.spad file. 2 0 0 0 0 83 2 0 0 0 0 82 2 0 0 0 0 87 2 0 0 0 0 85)))))) (QUOTE |lookupComplete|))) -(MAKEPROP (QUOTE |OutputForm|) (QUOTE NILADIC) T) +(setf (get (QUOTE |OutputForm|) (QUOTE NILADIC)) T) \end{chunk} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{PI.lsp BOOTSTRAP} @@ -150170,9 +150170,9 @@ Note that this code is not included in the generated catdef.spad file. (|stuffDomainSlots| $) $)))) -(MAKEPROP +(setf (get (QUOTE |PositiveInteger|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL @@ -150209,7 +150209,7 @@ Note that this code is not included in the generated catdef.spad file. 0 0 0 1 2 0 0 6 0 1)))))) (QUOTE |lookupComplete|))) -(MAKEPROP (QUOTE |PositiveInteger|) (QUOTE NILADIC) T) +(setf (get (QUOTE |PositiveInteger|) (QUOTE NILADIC)) T) \end{chunk} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -150332,7 +150332,7 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV $ 6 |#1|) $)))) -(MAKEPROP (QUOTE |PrimitiveArray|) (QUOTE |infovec|) +(setf (get (QUOTE |PrimitiveArray|) (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|NonNegativeInteger|) @@ -150477,9 +150477,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |REF;coerce;$Of;7|) $)))) $)))) -(MAKEPROP +(setf (get (QUOTE |Reference|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (|local| |#1|) (QUOTE |Rep|) (|Boolean|) @@ -150952,7 +150952,7 @@ Note that this code is not included in the generated catdef.spad file. (QSETREFV $ 6 1) $)))) -(MAKEPROP '|SingleInteger| '|infovec| +(setf (get '|SingleInteger| '|infovec|) (LIST '#(NIL NIL NIL NIL NIL NIL '|seed| (|Void|) (|OpenMathDevice|) (0 . |OMputApp|) (|String|) (5 . |OMputSymbol|) (|Integer|) (12 . |OMputInteger|) @@ -151152,7 +151152,7 @@ Note that this code is not included in the generated catdef.spad file. 2 0 0 101 0 1))))) '|lookupComplete|)) -(MAKEPROP (QUOTE |SingleInteger|) (QUOTE NILADIC) T) +(setf (get (QUOTE |SingleInteger|) (QUOTE NILADIC)) T) \end{chunk} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -151845,7 +151845,7 @@ Note that this code is not included in the generated catdef.spad file. (SPADCALL (SPADCALL "0" (QREFELT $ 40)) (QREFELT $ 41))) $)))) -(MAKEPROP '|Symbol| '|infovec| +(setf (get '|Symbol| '|infovec|) (LIST '#(NIL NIL NIL NIL NIL NIL (|Integer|) (|Reference| 6) (0 . |ref|) '|count| (|AssociationList| $$ 6) (5 . |empty|) '|xcount| (|List| 28) (|PrimitiveArray| 28) @@ -151947,7 +151947,7 @@ Note that this code is not included in the generated catdef.spad file. 20 0 0 48 2 0 20 0 0 1 2 0 20 0 0 49))))) '|lookupComplete|)) -(MAKEPROP '|Symbol| 'NILADIC T) +(setf (get '|Symbol| 'NILADIC) T) \end{chunk} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -152045,9 +152045,9 @@ Note that this code is not included in the generated catdef.spad file. (CONS (|dispatchFunction| |VECTOR;convert;$If;2|) $)))) $)))) -(MAKEPROP +(setf (get (QUOTE |Vector|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL (|IndexedVector| 6 (NRTEVAL 1)) (|local| |#1|) (|List| 6) (0 . |construct|) |VECTOR;vector;L$;1| (|String|) (|Symbol|) diff --git a/books/bookvol4.pamphlet b/books/bookvol4.pamphlet index 34818d9..ebd5476 100644 --- a/books/bookvol4.pamphlet +++ b/books/bookvol4.pamphlet @@ -3159,9 +3159,9 @@ This code is equivalent (ignoring the gensyms) to the call The \$ symbol refers to the domain. At runtime this amounts to a lookup of the ``infovec''. The compile-time infovec shown here: \begin{verbatim} -(MAKEPROP +(setf (get (QUOTE |Character|) - (QUOTE |infovec|) + (QUOTE |infovec|)) (LIST (QUOTE #(NIL @@ -4593,7 +4593,7 @@ code: (QSETREFV $ 10 (SPADCALL (QUOTE NIL) (QREFELT $ 9))) $)))) -(MAKEPROP (QUOTE |Any|) (QUOTE |infovec|) +(setf (get (QUOTE |Any|) (QUOTE |infovec|)) (LIST (QUOTE #(NIL NIL NIL NIL NIL NIL (QUOTE |Rep|) @@ -4624,7 +4624,7 @@ code: 2 0 7 0 0 18)))))) (QUOTE |lookupComplete|))) -(MAKEPROP (QUOTE |Any|) (QUOTE NILADIC) T) +(setf (get (QUOTE |Any|) (QUOTE NILADIC)) T) \end{verbatim} We can ignore this information and focus on the functions that are defined in this file. These functions can be traced with the usual diff --git a/books/bookvol5.pamphlet b/books/bookvol5.pamphlet index 29aa34d..e6ef99f 100644 --- a/books/bookvol5.pamphlet +++ b/books/bookvol5.pamphlet @@ -37562,7 +37562,6 @@ database format. \calls{loadLib}{installConstructor} \calls{loadLib}{updateCategoryTable} \calls{loadLib}{categoryForm?} -\calls{loadLib}{makeprop} \calls{loadLib}{remprop} \calls{loadLib}{stopTimingProcess} \refsdollar{loadLib}{InteractiveMode} @@ -37595,9 +37594,9 @@ database format. (setq sig (cdar u)) (cons nil (loop for x in (cdr sig) collect (|categoryForm?| x))))) (if (null (cdr (getdatabase cname 'constructorform))) - (makeprop cname 'niladic t) + (setf (get cname 'niladic) t) (remprop cname 'niladic)) - (makeprop cname 'loaded fullLibName) + (setf (get cname 'loaded) fullLibName) (when |$InteractiveMode| (setq |$CategoryFrame| (list (list nil)))) (|stopTimingProcess| '|load|) t))))) @@ -37620,7 +37619,6 @@ database format. \calls{loadLibNoUpdate}{toplevel} \calls{loadLibNoUpdate}{clearConstructorCache} \calls{loadLibNoUpdate}{installConstructor} -\calls{loadLibNoUpdate}{makeprop} \calls{loadLibNoUpdate}{stopTimingProcess} \refsdollar{loadLibNoUpdate}{printLoadMsgs} \refsdollar{loadLibNoUpdate}{InteractiveMode} @@ -37642,7 +37640,7 @@ database format. (t (|clearConstructorCache| cname) (|installConstructor| cname kind) - (makeprop cname 'loaded fullLibName) + (setf (get cname 'loaded) fullLibName) (when |$InteractiveMode| (setq |$CategoryFrame| (list (list nil)))) (|stopTimingProcess| '|load|))) t)) @@ -38034,6 +38032,18 @@ Note that this assumes ``table'' is a string. \end{chunk} +\chapter{Record, Union, Mapping, and Enumeration} +\begin{chunk}{postvars} +(eval-when (eval load) + (mapcar #'(lambda (alist) + (setf (get (first alist) '|makeFunctionList|) (second alist))) + '((|Record| |mkRecordFunList|) + (|Union| |mkUnionFunList|) + (|Mapping| |mkMappingFunList|) + (|Enumeration| |mkEnumerationFunList|)))) + +\end{chunk} + \chapter{Common Lisp Algebra Support} These functions are called directly from the algebra source code. They fall into two basic categories, one are the functions that are @@ -38054,15 +38064,6 @@ but the Axiom semantics are not the same. Because Axiom was originally written in Maclisp, then VMLisp, and then Common Lisp some of these old semantics survive. -;spad2BootCoerce(x,source,target) == -; -- x : source and we wish to coerce to target -; -- used in spad code for Any -; null isValidType source => throwKeyedMsg("S2IE0004",[source]) -; null isValidType target => throwKeyedMsg("S2IE0004",[target]) -; x' := coerceInteractive(objNewWrap(x,source),target) => -; objValUnwrap(x') -; throwKeyedMsgCannotCoerceWithValue(wrap x,source,target) - \section{AlgebraicFunction} \defun{retract}{retract} \calls{retract}{objMode} diff --git a/books/bookvol9.pamphlet b/books/bookvol9.pamphlet index a0f2c54..c5af8fd 100644 --- a/books/bookvol9.pamphlet +++ b/books/bookvol9.pamphlet @@ -1114,7 +1114,7 @@ each of which we will explain in detail below. (CONS (|dispatchFunction| |EQ;subst;3$;43|) $)))) $)))) -(MAKEPROP '|Equation| '|infovec| +(setf (get '|Equation| '|infovec|) (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) '|Rep| (0 . |rightZero|) |EQ;lhs;$S;4| (|Factored| $) (5 . |factor|) @@ -1705,7 +1705,7 @@ prettyprint since it is normally only read by machine. \subsection{The ``loadTimeStuff''} \begin{verbatim} -(MAKEPROP '|Equation| '|infovec| +(setf (get '|Equation| '|infovec|) (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) '|Rep| (0 . |rightZero|) |EQ;lhs;$S;4| (|Factored| $) (5 . |factor|) @@ -6353,7 +6353,7 @@ $\rightarrow$ |$libFile|) (unless sargl (|evalAndRwriteLispForm| 'niladic - (list 'makeprop (list 'quote opp) ''niladic t))) + `(setf (get ',opp 'niladic) t))) ;; 6 put modemaps into InteractiveModemapFrame (setq |$domainShell| (|eval| (cons opp (mapcar 'mkq sargl)))) (setq |$lisplibCategory| formalBody) @@ -7723,7 +7723,6 @@ Make pattern variable substitutions. \calls{finalizeLisplib}{mergeSignatureAndLocalVarAlists} \calls{finalizeLisplib}{finalizeDocumentation} \calls{finalizeLisplib}{profileWrite} -\calls{finalizeLisplib}{makeprop} \calls{finalizeLisplib}{sayMSG} \refsdollar{finalizeLisplib}{lisplibForm} \refsdollar{finalizeLisplib}{libFile} @@ -7801,7 +7800,7 @@ Make pattern variable substitutions. (|lisplibWrite| "slot1Info" (|removeZeroOne| |$lisplibSlot1|) |$libFile|) (when |$profileCompiler| (|profileWrite|)) (when (and |$lisplibForm| (null (cdr |$lisplibForm|))) - (makeprop (car |$lisplibForm|) 'niladic t)) + (setf (get (car |$lisplibForm|) 'niladic) t)) (unless (eql errors 0) (|sayMSG| (list " Errors in processing " kind " " libName ":")) (|sayMSG| (list " not replacing " |$spadLibFT| " for" libName))))) @@ -8322,7 +8321,7 @@ where item has form (loop for x in |$NRTslot1PredicateList| collect (|simpBool| x))) (|rwriteLispForm| '|loadTimeStuff| - (list 'makeprop (mkq |$op|) ''|infovec| (|getInfovecCode|))))) + `(setf (get ,(mkq |$op|) '|infovec|) ,(|getInfovecCode|))))) (setq |$lisplibSlot1| |$NRTslot1Info|) (setq |$lisplibOperationAlist| operationAlist) (setq |$lisplibMissingFunctions| |$CheckVectorList|))) @@ -8343,7 +8342,7 @@ where item has form |$libFile|) (unless argl (|evalAndRwriteLispForm| 'niladic - (list 'makeprop (list 'quote opp) (list 'quote 'niladic) t))) + `(setf (get ',opp 'niladic) t))) (list fun (cons '|Mapping| signaturep) originale)))) (progn (|sayBrightly| " cannot produce category object:") @@ -21271,8 +21270,7 @@ preferred to the underlying representation -- RDJ 9/12/83 (car transimp)) ((and (< 0 (|#| transimp)) (equal m |$NoValueMode|)) (car transimp)) - (t (format t "compAtomWithModemap case 4~%") - nil)))))) + (t nil)))))) \end{chunk} diff --git a/changelog b/changelog index b94b588..e62b0b5 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,13 @@ +20111105 tpd src/axiom-website/patches.html 20111105.01.tpd.patch +20111105 tpd src/interp/vmlisp.lisp remove makeprop +20111105 tpd src/interp/sys-pkg.lisp remove makeprop +20111105 tpd src/interp/parsing.lisp remove makeprop +20111105 tpd src/interp/i-spec2.lisp remove makeprop +20111105 tpd books/bookvol9 remove makeprop +20111105 tpd books/bookvol5 remove makeprop +20111105 tpd books/bookvol4 remove makeprop +20111105 tpd books/bookvol10.3 remove makeprop +20111105 tpd books/bookvol10.2 remove makeprop 20111019 tpd src/axiom-website/patches.html 20111019.01.tpd.patch 20111019 tpd src/interp/apply.lisp treeshake compiler 20111019 tpd books/bookvol9 treeshake compiler diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html index bc7d53d..5a8cf9f 100644 --- a/src/axiom-website/patches.html +++ b/src/axiom-website/patches.html @@ -3660,5 +3660,7 @@ src/interp/nruntime.lisp removed
books/bookvol5 treeshake interpreter
20111019.01.tpd.patch books/bookvol9 treeshake compiler
+20111105.01.tpd.patch +src/interp/vmlisp.lisp remove makeprop
diff --git a/src/interp/i-spec2.lisp.pamphlet b/src/interp/i-spec2.lisp.pamphlet index e3fede7..e5e4476 100644 --- a/src/interp/i-spec2.lisp.pamphlet +++ b/src/interp/i-spec2.lisp.pamphlet @@ -4080,7 +4080,7 @@ There are several special modes used in these functions: (EVALANDFILEACTQ (REPEAT (IN |name| |$specialOps|) (SEQ (SPADLET |functionName| (INTERNL '|up| |name|)) - (MAKEPROP |name| '|up| |functionName|) + (setf (get |name| '|up|) |functionName|) (EXIT |functionName|)))) \end{chunk} diff --git a/src/interp/parsing.lisp.pamphlet b/src/interp/parsing.lisp.pamphlet index 1054062..bc6c6e8 100644 --- a/src/interp/parsing.lisp.pamphlet +++ b/src/interp/parsing.lisp.pamphlet @@ -111,9 +111,8 @@ top \end{chunk} \subsection{Constructing parsing procedures} \begin{chunk}{*} -; (MAKEPROP 'PROGN 'NARY T) ; Setting for Make-Parse-Function (eval-when (eval load) - (setf (get 'progn 'nary) t)) + (setf (get 'progn 'nary) t)) ; Setting for Make-Parse-Function (defun make-parse-function (l op) (when (flagp op 'nary) (setq l (make-parse-func-flatten-1 l op nil))) @@ -587,7 +586,7 @@ foo defined inside of fum gets renamed as fum,foo.") (defun MKPROGN (L) (MKPF L 'PROGN)) -(mapcar #'(lambda (x) (MAKEPROP (CAR X) 'RENAME (CDR X))) +(mapcar #'(lambda (x) (setf (get (CAR X) 'RENAME) (CDR X))) '((|true| 'T) (|otherwise| 'T) (|false| NIL) (|and| AND) (|or| OR) (|is| IS) (|list| LIST) (|cons| CONS) diff --git a/src/interp/sys-pkg.lisp.pamphlet b/src/interp/sys-pkg.lisp.pamphlet index 4ec4ec6..6946d72 100644 --- a/src/interp/sys-pkg.lisp.pamphlet +++ b/src/interp/sys-pkg.lisp.pamphlet @@ -398,7 +398,7 @@ provides support for compiler code. VMLISP::STRING2ID-N VMLISP::CALLBELOW VMLISP::BPINAME VMLISP::CHANGELENGTH VMLISP::ECQ VMLISP::OBEY VMLISP::QASSQ VMLISP::DCQ VMLISP::SHUT VMLISP::FILE VMLISP::HPUT - VMLISP::MAKEPROP VMLISP::GREATERP + VMLISP::GREATERP VMLISP::REROOT VMLISP::DIG2FIX VMLISP::L-CASE VMLISP::TEREAD VMLISP::QSREMAINDER VMLISP::$FINDFILE VMLISP::EQQ VMLISP::PRETTYPRINT VMLISP::HASHEQ VMLISP::LOG2 @@ -715,7 +715,6 @@ provides support for compiler code. (lisp:import '(vmlisp::rplpair)) (lisp:import '(vmlisp::nump)) (lisp:import '(vmlisp::intp)) -(lisp:import '(vmlisp::makeprop)) (lisp:import '(vmlisp::ifcar)) (lisp:import '(vmlisp::ifcdr)) (lisp:import '(vmlisp::quotient)) diff --git a/src/interp/vmlisp.lisp.pamphlet b/src/interp/vmlisp.lisp.pamphlet index fe6123e..9bee962 100644 --- a/src/interp/vmlisp.lisp.pamphlet +++ b/src/interp/vmlisp.lisp.pamphlet @@ -573,7 +573,7 @@ documentclass{article} ; 11.2 Accessing -(define-function 'MAKEPROP #'put) +(defun put (sym ind val) (setf (get sym ind) val)) (defun QUOTIENT (x y) (cond ((or (floatp x) (floatp y)) (lisp:/ x y)) @@ -2595,7 +2595,8 @@ for primitive domains. Also used by putInLocalDomainReferences and optCal ((EQCAR A 'CDR) (LIST 'RPLACD (CADR A) B)) ((ERROR 'RPLAC)))))) -(MAPC #'(LAMBDA (J) (MAKEPROP (CAR J) 'SELCODE (CADR J))) +(MAPC #'(lambda (j) + (setf (get (first j) 'selcode) (second j))) '((CAR 2) (CDR 3) (CAAR 4) (CADR 5) (CDAR 6) (CDDR 7) (CAAAR 8) (CAADR 9) (CADAR 10) (CADDR 11) (CDAAR 12) (CDADR 13) (CDDAR 14) (CDDDR 15) (CAAAAR 16) (CAAADR 17) @@ -2998,9 +2999,9 @@ LP (COND ((NULL X) ; 10.1 The Property List -(DEFUN FLAG (L KEY) +(defun flag (l key) "Set the KEY property of every item in list L to T." - (mapc #'(lambda (item) (makeprop item KEY T)) L)) + (mapc #'(lambda (item) (setf (get item key) t)) l)) (FLAG '(* + AND OR PROGN) 'NARY) ; flag for MKPF @@ -3112,7 +3113,7 @@ LP (COND ((NULL X) (defmacro spadREDUCE (OP AXIS BOD) (REDUCE-1 OP AXIS BOD)) -(MAPC #'(LAMBDA (X) (MAKEPROP (CAR X) 'THETA (CDR X))) +(MAPC #'(lambda (x) (setf (get (first x) 'theta) (rest x))) '((PLUS 0) (+ (|Zero|)) (|lcm| (|One|)) (STRCONC "") (|strconc| "") (MAX -999999) (MIN 999999) (TIMES 1) (* (|One|)) (CONS NIL) (APPEND NIL) (|append| NIL) (UNION NIL) (UNIONQ NIL) (|gcd| (|Zero|)) @@ -3131,14 +3132,14 @@ LP (COND ((NULL X) ((and (atom item) (not (arrayp item))) (remove item sequence)) (T (remove item sequence :test #'equalp)))) -(MAPC #'(LAMBDA (J) (MAKEPROP (CAR J) 'UNMACRO (CADR J))) +(MAPC #'(lambda (j) (setf (get (first j) 'unmacro) (second j))) '( (AND AND2) (OR OR2))) (defun and2 (x y) (and x y)) (defun or2 (x y) (or x y)) -(MAKEPROP 'CONS 'RIGHT-ASSOCIATIVE T) +(setf (get 'cons 'right-associative) t) (defun REDUCE-1 (OP AXIS BOD) (let (u op1 tran iden) @@ -4105,7 +4106,7 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size (DEFUN COMP-ILAM (NAME ARGL BODYL) (let* ((FARGL (NLIST (LENGTH ARGL) '(GENSYM))) (BODYLP (SUBLISLIS FARGL ARGL BODYL))) - (MAKEPROP NAME 'ILAM T) + (setf (get name 'ilam) t) (SET NAME (CONS 'LAMBDA (CONS FARGL BODYLP))) NAME)) @@ -4276,9 +4277,6 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size (let (u) (cond ((ATOM X) NIL) ((eq (setq U (CAR X)) 'QUOTE) NIL) - ((AND (eq U 'MAKEPROP) $TRACELETFLAG (RPLAC (CAR X) 'MAKEPROP-SAY) NIL) - NIL) - ; temporarily make TRACELET cause MAKEPROPs to be reported ((member U '(DCQ RELET PRELET SPADLET SETQ LET) ) (COND ((NOT (eq U 'DCQ)) (COND ((OR (AND (eq $NEWSPAD T) (NOT $BOOT)) @@ -4377,16 +4375,16 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size (DEFVAR /TRACELETNAMES ()) (DEFVAR /PRETTY () "controls pretty printing of trace output") (SETANDFILEQ /ECHO NIL) ;;"prevents echo of SPAD or BOOT code with /c" -(MAKEPROP 'LISP '/TERMCHR '(#\ #\()) -(MAKEPROP 'LSP '/TERMCHR '(#\ #\()) -(MAKEPROP 'META '/TERMCHR '(#\: #\()) -(MAKEPROP 'INPUT '/TERMCHR '(#\: #\< #\ #\()) -(MAKEPROP 'SPAD '/TERMCHR '(#\: #\< #\ #\()) -(MAKEPROP 'BOOT '/TERMCHR '(#\: #\< #\ #\()) -(MAKEPROP 'META '/READFUN 'META\,RULE) -(MAKEPROP 'INPUT '/READFUN '|New,LEXPR,Interactive|) -(MAKEPROP 'BOOT '/READFUN '|New,LEXPR1|) -(MAKEPROP 'SPAD '/READFUN '|New,LEXPR|) +(setf (get 'lisp '/termchr) '(#\ #\()) +(setf (get 'lsp '/termchr) '(#\ #\()) +(setf (get 'meta '/termchr) '(#\: #\()) +(setf (get 'input '/termchr) '(#\: #\< #\ #\()) +(setf (get 'spad '/termchr) '(#\: #\< #\ #\()) +(setf (get 'boot '/termchr) '(#\: #\< #\ #\()) +(setf (get 'meta '/readfun) 'META\,RULE) +(setf (get 'input '/readfun) '|New,LEXPR,Interactive|) +(setf (get 'boot '/readfun) '|New,LEXPR1|) +(setf (get 'spad '/readfun) '|New,LEXPR|) (defmacro |/C,LIB| (&rest L &aux optionlist /editfile ($prettyprint 't) ($reportCompilation 't)) @@ -4514,8 +4512,7 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size (SHUT INPUTSTREAM) )) ;;(SETQ INFILE (|pathname| (IFCAR ($LISTFILE INFILE)))) (SETQ INFILE (boot::makeInputFilename INFILE)) - (MAKEPROP /FN 'DEFLOC - (CONS RECNO INFILE)) + (setf (get /fn 'defloc) (cons recno infile)) (SETQ oft (|object2Identifier| (UPCASE (|pathnameType| INFILE)))) (COND ( (NULL OP) @@ -4798,7 +4795,7 @@ EXAMINE (SETQ RECNO (NOTE INPUTSTREAM)) (|isDomainOrPackage| (SETQ FNVAL (EVAL FN)))) (RETURN (|spadTrace| FNVAL OPTIONS))) (if (SETQ U (/GETTRACEOPTIONS OPTIONS 'MASK=)) - (MAKEPROP FN '/TRANSFORM (CADR U))) + (setf (get fn '/transform) (second u))) (SETQ /TRACENAMES (COND ((/GETTRACEOPTIONS OPTIONS 'ALIAS) /TRACENAMES) ((ATOM /TRACENAMES) (LIST FN)) @@ -5382,13 +5379,13 @@ EXAMINE (SETQ RECNO (NOTE INPUTSTREAM)) ; Utility functions for Tracing Package ; ********************************************************************** -(MAKEPROP '|coerce| '/TRANSFORM '(& & *)) -(MAKEPROP '|comp| '/TRANSFORM '(& * * &)) -(MAKEPROP '|compIf| '/TRANSFORM '(& * * &)) +(setf (get '|coerce| '/transform) '(& & *)) +(setf (get '|comp| '/transform) '(& * * &)) +(setf (get '|compIf| '/transform) '(& * * &)) ; by having no transform for the 3rd argument, it is simply not printed -(MAKEPROP '|compFormWithModemap| '/TRANSFORM '(& * * & *)) +(setf (get '|compFormWithModemap| '/TRANSFORM) '(& * * & *)) (defun UNVEC (X) (COND ((REFVECP X) (CONS '$ (VEC_TO_TREE X))) @@ -5500,7 +5497,7 @@ now the function is defined but does nothing. (define-function 'list1 #'list) (define-function '|not| #'NOT) -(MAKEPROP 'END_UNIT 'KEY T) +(setf (get 'end_unit 'key) t) (defun |process| (x) (COND ((NOT (EQ TOK 'END_UNIT)) @@ -5551,15 +5548,15 @@ now the function is defined but does nothing. (defun |makeSF| (mantissa exponent) (|float| (/ mantissa (expt 2 (- exponent))))) -(MAKEPROP 'COND '|Nud| '(|if| |if| 130 0)) -(MAKEPROP 'CONS '|Led| '(CONS CONS 1000 1000)) -(MAKEPROP 'APPEND '|Led| '(APPEND APPEND 1000 1000)) -(MAKEPROP 'TAG '|Led| '(TAG TAG 122 121)) -(MAKEPROP 'EQUATNUM '|Nud| '(|dummy| |dummy| 0 0)) -(MAKEPROP 'EQUATNUM '|Led| '(|dummy| |dummy| 10000 0)) -(MAKEPROP 'LET '|Led| '(:= LET 125 124)) -(MAKEPROP 'RARROW '|Led| '(== DEF 122 121)) -(MAKEPROP 'SEGMENT '|Led| '(\.\. SEGMENT 401 699 (|boot-Seg|))) +(setf (get 'cond '|Nud|) '(|if| |if| 130 0)) +(setf (get 'cons '|Led|) '(cons cons 1000 1000)) +(setf (get 'append '|Led|) '(append append 1000 1000)) +(setf (get 'tag '|Led|) '(tag tag 122 121)) +(setf (get 'equatnum '|Nud|) '(|dummy| |dummy| 0 0)) +(setf (get 'equatnum '|Led|) '(|dummy| |dummy| 10000 0)) +(setf (get 'let '|Led|) '(:= let 125 124)) +(setf (get 'rarrow '|Led|) '(== def 122 121)) +(setf (get 'segment '|Led|) '(\.\. segment 401 699 (|boot-Seg|))) ;; function to create byte and half-word vectors in new runtime system 8/90 @@ -5902,8 +5899,8 @@ now the function is defined but does nothing. (SETQ |$useConvertForCoercions| NIL) -(MAKEPROP '|One| '|defaultType| |$Integer|) -(MAKEPROP '|Zero| '|defaultType| |$Integer|) +(setf (get '|One| '|defaultType|) |$Integer|) +(setf (get '|Zero| '|defaultType|) |$Integer|) ;; Following were originally in EXPLORE BOOT @@ -5996,16 +5993,16 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" \end{verbatim} \begin{chunk}{*} -(MAKEPROP 'END_UNIT 'KEY 'T) +(setf (get 'end_unit 'key) t) -(MAKEPROP 'TAG 'Led '(TAG TAG 122 121)) -(MAKEPROP 'EQUATNUM '|Nud| '(|dummy| |dummy| 0 0)) -(MAKEPROP 'EQUATNUM '|Led| '(|dummy| |dummy| 10000 0)) -(MAKEPROP 'LET '|Led| '(|:=| LET 125 124)) -(MAKEPROP 'RARROW '|Led| '(== DEF 122 121)) -(MAKEPROP 'SEGMENT '|Led| '(|..| SEGMENT 401 699 (|P:Seg|))) -(MAKEPROP 'SEGMENT '|isSuffix| 'T) -(MAKEPROP 'EQUAL1 'CHRYBNAM 'EQ) +(setf (get 'tag 'Led) '(tag tag 122 121)) +(setf (get 'equatnum '|Nud|) '(|dummy| |dummy| 0 0)) +(setf (get 'equatnum '|Led|) '(|dummy| |dummy| 10000 0)) +(setf (get 'let '|Led|) '(|:=| let 125 124)) +(setf (get 'rarrow '|Led|) '(== def 122 121)) +(setf (get 'segment '|Led|) '(|..| segment 401 699 (|P:Seg|))) +(setf (get 'segment '|isSuffix|) t) +(setf (get 'equal1 'chrybnam) 'eq) (REPEAT (IN X '( (LET " := ") @@ -6050,7 +6047,7 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" (AT " AT ") (MAX " MAX ") (MIN " MIN ") - )) (MAKEPROP (CAR X) 'INFIXOP (CADR X))) + )) (setf (get (first x) 'infixop) (second x))) (REPEAT (IN X '( (= "=") @@ -6058,7 +6055,7 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" (|not| "^ ") (\| " \| ") (SEGMENT "..") ;" 0.. is represented by (SEGMENT 0)" - )) (MAKEPROP (CAR X) 'PREFIXOP (CADR X))) + )) (setf (get (first x) 'prefixop) (second x))) (REPEAT (IN X '( (+ WIDTH |sumWidth|) @@ -6149,8 +6146,7 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" (ZAG SUBSPAN |zagSub|) (ZAG SUPERSPAN |zagSuper|) (ZAG WIDTH |zagWidth|) -)) (PROGN (MAKEPROP (CAR X) (CADR X) (CADDR X))) -) +)) (setf (get (first x) (second x)) (third x))) (REPEAT (IN X '( (+ APP |plusApp|) @@ -6219,8 +6215,7 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" (BRACKET APP |bracketApp|) (BRACE APP |braceApp|) (BRACE WIDTH |qTWidth|) -)) (PROGN (MAKEPROP (CAR X) (CADR X) (CADDR X))) -) +)) (setf (get (first x) (second x)) (third x))) ;; from DEF LISP @@ -6228,18 +6223,18 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" (REPEAT (IN X '( |Polynomial| |UnivariatePoly| |SquareMatrix| |QuotientField| - )) (MAKEPROP X '|status| - (INTERNL (STRCONC "status" (STRINGIMAGE X)))))) + )) +(setf (get x '|status|) (internl (strconc "status" (stringimage x))))) (REPEAT (IN X '( |UnivariatePoly| |Matrix| |QuotientField| |Gaussian| - )) (MAKEPROP X '|dataCoerce| - (INTERNL (STRCONC "coerce" (STRINGIMAGE X)))))) + )) +(setf (get x '|dataCoerce|) (internl (strconc "coerce" (stringimage x))))) ;; this property is checked for Integers to decide which subdomain to ;; choose at compile time. -(MAKEPROP '|Integer| '|Subsets| +(setf (get '|Integer| '|Subsets|) '((|PositiveInteger| . (|>| * 0)) (|NonNegativeInteger| . (|>=| * 0)) (|NegativeInteger| . (|<| * 0)) @@ -6248,28 +6243,19 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" (|SingleInteger| . (typep * 'fixnum)) )) -(MAKEPROP '|NonNegativeInteger| '|Subsets| '( - (|PositiveInteger| . (|>| * 0)) - )) +(setf (get '|NonNegativeInteger| '|Subsets|) + '((|PositiveInteger| . (|>| * 0)))) -(MAKEPROP '|NonPositiveInteger| '|Subsets| '( - (|NegativeInteger| . (|<| * 0)) - )) +(setf (get '|NonPositiveInteger| '|Subsets|) + '((|NegativeInteger| . (|<| * 0)))) (FLAG '(|Union| |Record| |Enumration| |Mapping| |Enumeration|) 'FUNCTOR) (FLAG '(* + AND OR PROGN) 'NARY) -(REPEAT (IN X '( - (|Record| |mkRecordFunList|) - (|Union| |mkUnionFunList|) - (|Mapping| |mkMappingFunList|) - (|Enumeration| |mkEnumerationFunList|) -)) (MAKEPROP (CAR X) '|makeFunctionList| (CADR X))) - -(MAKEPROP 'INTEGER 'ISFUNCTION 'INTEGERP) -(MAKEPROP '|Integer| '|isFunction| '|IsInteger|) -(MAKEPROP '|Boolean| '|isFunction| '|isBoolean|) +(setf (get 'integer 'isfunction) 'integerp) +(setf (get '|Integer| '|isFunction|) '|IsInteger|) +(setf (get '|Boolean| '|isFunction|) '|isBoolean|) ;; Many of the following are now in COMPAT LISP (REPEAT (IN X '( @@ -6336,7 +6322,7 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" (\| SUCHTHAT) (T T$) (UNION |union|) -)) (MAKEPROP (CAR X) 'RENAME (CDR X))) +)) (setf (get (first x) 'rename) (rest x))) ;; these are accessor names for fields in data structures. Thus one would ;; write datastructure.setName @@ -6377,14 +6363,14 @@ o there is some code at the end of SPECEVAL BOOT that puts "up" (|streamDef| CADDR) (|streamName| CADR) (|target| CAR) -)) (MAKEPROP (CAR X) '|SEL,FUNCTION| (CADR X))) +)) (setf (get (first x) '|SEL,FUNCTION|) (second x))) (REPEAT (IN X '( (\: |compColonInteractive|) (DEF |compDefineInteractive|) (|construct| |compConstructInteractive|) (LET |compSetqInteractive|) -)) (MAKEPROP (CAR X) 'INTERACTIVE (CADR X))) +)) (setf (get (first x) 'interactive) (second x))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;