diff --git a/books/bookvol9.pamphlet b/books/bookvol9.pamphlet index 238f2ec..1b8cccd 100644 --- a/books/bookvol9.pamphlet +++ b/books/bookvol9.pamphlet @@ -6456,18 +6456,18 @@ $\rightarrow$ (when opexport (|userError| (list '|%b| op '|%d| " is local and exported"))) (intern (strconc (|encodeItem| |$prefix|) ";" (|encodeItem| op)))) - ((and (|isPackageFunction|) - (nequal (kar |$functorForm|) '|CategoryDefaults|)) - (when (null opmodes) (|userError| (list "no modemap for " op))) - (cond - ((and (pairp opmodes) (eq (qcdr opmodes) nil) (pairp (qcar opmodes)) - (eq (qcar (qcar opmodes)) 'pac) (pairp (qcdr (qcar opmodes))) - (pairp (qcdr (qcdr (qcar opmodes)))) - (eq (qcdr (qcdr (qcdr (qcar opmodes)))) nil)) - (qcar (qcdr (qcdr (qcar opmodes))))) - (t - (|encodeFunctionName| op |$functorForm| |$signatureOfForm| - '|;| |$suffix|)))) +; ((and (|isPackageFunction|) +; (nequal (kar |$functorForm|) '|CategoryDefaults|)) +; (when (null opmodes) (|userError| (list "no modemap for " op))) +; (cond +; ((and (pairp opmodes) (eq (qcdr opmodes) nil) (pairp (qcar opmodes)) +; (eq (qcar (qcar opmodes)) 'pac) (pairp (qcdr (qcar opmodes))) +; (pairp (qcdr (qcdr (qcar opmodes)))) +; (eq (qcdr (qcdr (qcdr (qcar opmodes)))) nil)) +; (qcar (qcdr (qcdr (qcar opmodes))))) +; (t +; (|encodeFunctionName| op |$functorForm| |$signatureOfForm| +; '|;| |$suffix|)))) (t (|encodeFunctionName| op |$functorForm| |$signatureOfForm| '|;| |$suffix|))))) @@ -8074,23 +8074,23 @@ where item has form (setq operationAlist (sublis |$pairlis| (elt |$domainShell| 1))) (setq parSignature (sublis |$pairlis| signaturep)) (setq parForm (sublis |$pairlis| form)) - (when (|isPackageFunction|) - (setq |$functorLocalParameters| - (cons nil - (let (tmp1 result) - (loop for i from 6 to (maxindex |$domainShell|) do - (setq tmp1 (elt |$domainShell| i)) - (when - (and (pairp tmp1) (pairp (qcdr tmp1)) (pairp (qcdr (qcdr tmp1))) - (eq (qcdr (qcdr (qcdr tmp1))) nil) - (pairp (qcar (qcdr (qcdr tmp1)))) - (eq (qcar (qcar (qcdr (qcdr tmp1)))) 'elt) - (pairp (qcdr (qcar (qcdr (qcdr tmp1))))) - (eq (qcar (qcdr (qcar (qcdr (qcdr tmp1))))) '$) - (pairp (qcdr (qcdr (qcar (qcdr (qcdr tmp1)))))) - (eq (qcdr (qcdr (qcdr (qcar (qcdr (qcdr tmp1)))))) nil)) - (push nil result))) - result)))) +; (when (|isPackageFunction|) +; (setq |$functorLocalParameters| +; (cons nil +; (let (tmp1 result) +; (loop for i from 6 to (maxindex |$domainShell|) do +; (setq tmp1 (elt |$domainShell| i)) +; (when +; (and (pairp tmp1) (pairp (qcdr tmp1)) (pairp (qcdr (qcdr tmp1))) +; (eq (qcdr (qcdr (qcdr tmp1))) nil) +; (pairp (qcar (qcdr (qcdr tmp1)))) +; (eq (qcar (qcar (qcdr (qcdr tmp1)))) 'elt) +; (pairp (qcdr (qcar (qcdr (qcdr tmp1))))) +; (eq (qcar (qcdr (qcar (qcdr (qcdr tmp1))))) '$) +; (pairp (qcdr (qcdr (qcar (qcdr (qcdr tmp1)))))) +; (eq (qcdr (qcdr (qcdr (qcar (qcdr (qcdr tmp1)))))) nil)) +; (push nil result))) +; result)))) (setq argPars (|makeFunctorArgumentParameters| argl (cdr signaturep) (car signaturep))) (setq |$functorLocalParameters| argl) diff --git a/changelog b/changelog index 05ac2f4..be847c3 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +20110827 tpd src/axiom-website/patches.html 20110827.01.tpd.patch +20110827 tpd src/interp/package.lisp remove isPackageFunction +20110827 tpd books/bookvol9 remove isPackageFunction 20110826 tpd src/axiom-website/patches.html 20110826.01.tpd.patch 20110826 tpd src/interp/Makefile remove define.lisp 20110826 tpd src/interp/define.lisp removed diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html index 7750cc0..24028cb 100644 --- a/src/axiom-website/patches.html +++ b/src/axiom-website/patches.html @@ -3598,5 +3598,7 @@ books/bookvol9 treeshake compiler
books/bookvol9 treeshake compiler
20110826.01.tpd.patch books/bookvol9 treeshake compiler
+20110827.01.tpd.patch +src/interp/package.lisp remove isPackageFunction
diff --git a/src/interp/package.lisp.pamphlet b/src/interp/package.lisp.pamphlet index e95a3ac..a9e9330 100644 --- a/src/interp/package.lisp.pamphlet +++ b/src/interp/package.lisp.pamphlet @@ -13,13 +13,6 @@ (IN-PACKAGE "BOOT" ) -;isPackageFunction() == -; -- called by compile/putInLocalDomainReferences -;--+ -; nil - -(DEFUN |isPackageFunction| () NIL) - ;processFunctorOrPackage(form,signature,data,localParList,m,e) == ;--+ ; processFunctor(form,signature,data,localParList,e)