diff --git a/ChangeLog.n b/ChangeLog.n index 3209eee9726473c79d972925250edcf9fdd7b091..25d0fe86fbd63fb3752e2763c18202a568b90e77 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -10,6 +10,42 @@ Tests for new features: <`no new features', `no tests for new features', or <standard changelog date stamp> * <changes go here...> + +******************************************************************************* +Fri Feb 14 15:27:21 PST 1997 Tom McClure <tomj@romeo> + + * aclpc/acl-widget.lisp + - commented out redundant silica:separator defclass + (this one became redundant because apparently one + had to be added to silica/gadgets.lisp which gets + compiled earlier + * silica/db-border.lisp + - made original silica:separator defclass #-aclpc + * clim/db-stream.lisp + - made original clim-internals:accept-values-pane + defclass #-aclpc (a #+aclpc version appears in + silica/framem.lisp) + * silica/event.lisp + - discovered some more instances of MOP package-change + repercussions (changed #+aclpc cl:mop-foo to + #+aclpc acl:mop-foo) + * sys/compile.lisp + - inserted compile-file-if-needed analog for defsystem.fsl + since I was getting sick of having to do it by hand + * sys/load.lisp, sys/loaddemo.lisp + - corrected filename references + * utils/defun.lisp + - aclpc chokes on ~#\linefeed in format strings since + it expects a CRLF pair, so I changed some warning + strings to be on one long line as a temporary workaround + * utils/lisp-utilities.lisp + - aclpc appears to be case-sensitive for features? + Should investigate further, but for now changed + #+CLIM-uses-Lisp... to #+clim-uses-lisp... + * utils/packages.lisp + - had inadvertantly removed some #+aclpc :shadow + forms, added them back in + ******************************************************************************* Thu Feb 6 16:18:21 PST 1997 Tom McClure <tomj@romeo> diff --git a/aclpc/acl-widget.lisp b/aclpc/acl-widget.lisp index 149a02d216d6a94a53cfef2a3041858fb3145e99..e91e01f3d088b8a4baba54e298bf465493cbe1c4 100644 --- a/aclpc/acl-widget.lisp +++ b/aclpc/acl-widget.lisp @@ -835,6 +835,14 @@ acl-gadget-id-mixin (in-package :silica) +;; this is defined in silica/db-border.lisp for non-mswin clims, and in +;; silica/gadgets.lisp for mswin clims -- apparently it needs to inherit +;; from basic-pane (and not pane) on mswin, and on aclpc the class +;; definition must come before any method definitions, but +;; silica/gadgets.lisp gets compiled before this file does, so we no longer +;; need this one... leaving it here as a reminder that this is a mess and +;; really ought to be cleaned up. -tjm 14Feb97 +#+ignore (defclass separator (oriented-gadget-mixin basic-pane) () #||((sheet-parent :accessor sheet-parent :initarg :sheet-parent) (frame :initarg :frame) diff --git a/clim/db-stream.lisp b/clim/db-stream.lisp index eb9dd2c28fe58551e65c3ed073b8aa8cd2a6e716..3e329fb179ef94eab21ff7cb91f3eabacd7c59e7 100644 --- a/clim/db-stream.lisp +++ b/clim/db-stream.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*- -;; $Header: /repo/cvs.copy/clim2/clim/db-stream.lisp,v 1.63 1997/02/05 01:43:10 tomj Exp $ +;; $Header: /repo/cvs.copy/clim2/clim/db-stream.lisp,v 1.64 1997/02/14 23:57:01 tomj Exp $ (in-package :clim-internals) @@ -371,6 +371,9 @@ (defclass interactor-pane (clim-stream-pane) ()) (defclass application-pane (clim-stream-pane) ()) +#-aclpc +;; apparently aclpc needs to do this in silica/framem.lisp since it refers +;; to the class in a note-frame-enabled method -tjm 12Feb97 (defclass accept-values-pane (clim-stream-pane) ()) (defclass pointer-documentation-pane (clim-stream-pane) ()) diff --git a/silica/db-border.lisp b/silica/db-border.lisp index e11ba286832ad43e8fe4f269a204528538f020c9..b3ba161160c267daee22b826ccffd303e97eca4f 100644 --- a/silica/db-border.lisp +++ b/silica/db-border.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: SILICA; Base: 10; Lowercase: Yes -*- -;; $Header: /repo/cvs.copy/clim2/silica/db-border.lisp,v 1.23 1997/02/05 01:50:38 tomj Exp $ +;; $Header: /repo/cvs.copy/clim2/silica/db-border.lisp,v 1.24 1997/02/14 23:57:06 tomj Exp $ "Copyright (c) 1989, 1990 by Xerox Corporation. All rights reserved. Portions copyright (c) 1991, 1992 by Symbolics, Inc. All rights reserved." @@ -146,6 +146,6 @@ ;;; Separator panes - +#-(or aclpc acl86win32) ;; in mswin we do this in silica/gadgets.lisp (?) -tjm 12Feb97 (defclass separator (oriented-gadget-mixin pane) ()) diff --git a/silica/event.lisp b/silica/event.lisp index f1cf882badc84d97866c141a363fa5a980c23040..1bb7ba763769f869cb928b5bb9fc8dbc1cbc70ea 100644 --- a/silica/event.lisp +++ b/silica/event.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: SILICA; Base: 10; Lowercase: Yes -*- -;; $Header: /repo/cvs.copy/clim2/silica/event.lisp,v 1.41 1997/02/05 01:50:57 tomj Exp $ +;; $Header: /repo/cvs.copy/clim2/silica/event.lisp,v 1.42 1997/02/14 23:57:08 tomj Exp $ (in-package :silica) @@ -698,12 +698,13 @@ ;; Piling warts upon warts, we have to force finalization at ;; macroexpand time... - smh 18may93 (#+Allegro clos:finalize-inheritance - #-Allegro cl:finalize-inheritance + #+aclpc acl:finalize-inheritance + #-(or Allegro aclpc) cl:finalize-inheritance (find-class event-class)) ;smh 18may93 - (let* ((slots #+aclpc (cl:class-slots (find-class event-class)) + (let* ((slots #+aclpc (acl:class-slots (find-class event-class)) #-(or CCL-2 aclpc) (clos:class-slots (find-class event-class)) #+CCL-2 (ccl:class-slots (find-class event-class))) - (slot-names #+aclpc (mapcar #'cl:slot-definition-name slots) + (slot-names #+aclpc (mapcar #'acl:slot-definition-name slots) #-(or CCL-2 aclpc) (mapcar #'clos:slot-definition-name slots) #+CCL-2 (mapcar #'ccl:slot-definition-name slots)) (resource-name (fintern "*~A-~A*" event-class 'resource))) @@ -819,11 +820,11 @@ (defun copy-event (event) (let* ((class (class-of event)) (copy (allocate-instance class))) - (dolist (slot (#+aclpc cl:class-slots + (dolist (slot (#+aclpc acl:class-slots #-aclpc clos:class-slots class)) - (let ((name (#+aclpc cl:slot-definition-name + (let ((name (#+aclpc acl:slot-definition-name #-aclpc clos:slot-definition-name slot)) - (allocation (#+aclpc cl:slot-definition-allocation + (allocation (#+aclpc acl:slot-definition-allocation #-aclpc clos:slot-definition-allocation slot))) (when (and (eql allocation :instance) (slot-boundp event name)) diff --git a/sys/compile.lisp b/sys/compile.lisp index a09a00cea63da1f05550018ae5627f97dc1c5290..01790b161c7741a3c0d4da95c06fe44941ce0f2f 100644 --- a/sys/compile.lisp +++ b/sys/compile.lisp @@ -24,6 +24,14 @@ #+acl86win32 (compile-file-if-needed (climpath "sys\\defsystem.lisp")) +#+aclpc +(let* ((defsys-path (climpath "sys\\defsystem.lisp")) + (defsys-fsl-path (climpath "sys\\defsystem.fsl")) + (fsl-file-date (if (probe-file defsys-fsl-path) + (file-write-date defsys-fsl-path)))) + (unless (and fsl-file-date + (>= fsl-file-date (file-write-date defsys-path))) + (compile-file defsys-path))) #+aclpc (load (climpath "sys\\defsystem.fsl")) @@ -94,3 +102,5 @@ (clim-defsystem:compile-system "postscript-clim") (clim-defsystem:load-system "postscript-clim") + + diff --git a/sys/load.lisp b/sys/load.lisp index df37bc115029b3540356d82ee9ec5c8344679ea4..62210ef8feb8cb69a56950988a841092f39e14cd 100644 --- a/sys/load.lisp +++ b/sys/load.lisp @@ -23,7 +23,7 @@ #+acl86win32 (load (climpath "sys\\defsystem.fasl")) -(load (climpath "sys\\sysdcl.lisp")) +(load (climpath "sys\\sysdcl-pc.lisp")) (load (climpath "aclpc\\sysdcl.lisp")) @@ -41,7 +41,7 @@ #+acl86win32 (load (climpath "test\\test-suite.fasl")) -(load (climpath "demo\\sysdcl.lisp")) +(load (climpath "demo\\sysdcl-pc.lisp")) ) @@ -63,7 +63,7 @@ ;; postscipt backend -(load (climpath "postscript\\sysdcl.lisp")) +(load (climpath "postscript\\sysdcl-pc.lisp")) (clim-defsystem:load-system "postscript-clim") diff --git a/sys/loaddemo.lisp b/sys/loaddemo.lisp index 67419101005669c26c6e8bb38490c9bbf8760fa0..4e1e8332d318448e95d64c229b646f7901316b34 100644 --- a/sys/loaddemo.lisp +++ b/sys/loaddemo.lisp @@ -1,6 +1,6 @@ #+aclpc -(load (climpath "demo\\test-sui.fsl")) +(load (climpath "demo\\test-suite.fsl")) #+allegro (load (climpath "demo\\test-suite.fasl")) diff --git a/utils/defun.lisp b/utils/defun.lisp index 964fb26880d011994c4b9cded53c430ee9949632..6113024625ff4defc73de6471254bbdf944077ca 100644 --- a/utils/defun.lisp +++ b/utils/defun.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-UTILS; Base: 10; Lowercase: Yes -*- -;; $Header: /repo/cvs.copy/clim2/utils/defun.lisp,v 1.10 1997/02/05 01:54:48 tomj Exp $ +;; $Header: /repo/cvs.copy/clim2/utils/defun.lisp,v 1.11 1997/02/14 23:57:18 tomj Exp $ (in-package :clim-utils) @@ -200,8 +200,11 @@ (let ((warn (not (null (set-difference args non-dynamic-vars))))) (when (and warn *warn-about-copied-rest-args*) (let ((singular-p (null (cdr args)))) - (warn "The rest argument~:[s~] ~{~S~^, ~} will be copied at runtime ~ - because ~:[they are~;it is~] not declared to have dynamic extent." + ;; aclpc chokes on unix ~#\linefeed, so I had to make this all one + ;; line. there are many other instances of this in the rest of the + ;; clim code, though, so we should eventually employ charley's + ;; redefinition of read-up-to from pcspr4080 -tjm 12Feb97 + (warn "The rest argument~:[s~] ~{~S~^, ~} will be copied at runtime because ~:[they are~;it is~] not declared to have dynamic extent." singular-p args singular-p)))) nil) @@ -258,8 +261,8 @@ (let ((downward-name (second de))) (if (assoc downward-name functions) (push downward-name result) - (warn "Function ~S declared to have dynamic extent, but not ~ - defined in this ~A form" downward-name operator))) + (warn "Function ~S declared to have dynamic extent, but not defined in this ~A form" + downward-name operator))) (warn "Syntax error in ~A: invalid ~S declaration ~S" operator 'dynamic-extent de))) ;; Get rid of the errant declaration diff --git a/utils/lisp-utilities.lisp b/utils/lisp-utilities.lisp index 684c8e8fec2436ee1842a40fae430d3192984738..778bb8bedd2f79f81ae78ed6bb4e7cb698d03f33 100644 --- a/utils/lisp-utilities.lisp +++ b/utils/lisp-utilities.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-UTILS; Base: 10; Lowercase: Yes -*- -;; $Header: /repo/cvs.copy/clim2/utils/lisp-utilities.lisp,v 1.35 1997/02/05 01:54:59 tomj Exp $ +;; $Header: /repo/cvs.copy/clim2/utils/lisp-utilities.lisp,v 1.36 1997/02/14 23:57:20 tomj Exp $ (in-package :clim-utils) @@ -335,7 +335,7 @@ ;;; setting of that variable. I believe this implementation of WITH-OPEN-STREAM to ;;; have as small a timing window, and to be as semantically correct as possible. -#+(or (not CLIM-uses-Lisp-stream-functions) ;Do this if we provide CLOSE function +#+(or (not clim-uses-lisp-stream-functions) ;Do this if we provide CLOSE function Genera ; Sigh. CLOSE also shadowed for Genera. CCL-2) ; Sigh. CLOSE also shadowed for CCL-2. (defmacro with-open-stream ((stream-variable construction-form) &body body &environment env) diff --git a/utils/packages.lisp b/utils/packages.lisp index 5d8201916af4bd7e4716e056bfc0db55f31d373c..1f344dcc847901cc858891306502d977b575e176 100644 --- a/utils/packages.lisp +++ b/utils/packages.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER; Base: 10; Lowercase: Yes -*- -;; $Header: /repo/cvs.copy/clim2/utils/packages.lisp,v 1.71 1997/02/05 01:55:08 tomj Exp $ +;; $Header: /repo/cvs.copy/clim2/utils/packages.lisp,v 1.72 1997/02/14 23:57:24 tomj Exp $ (in-package :common-lisp-user) @@ -1013,6 +1013,48 @@ synonym-stream ) + ;; Stream Proposal -- Classes and class predicates. + #-clim-uses-lisp-stream-classes + (:shadow + fundamental-binary-input-stream + fundamental-binary-output-stream + fundamental-binary-stream + fundamental-character-input-stream + fundamental-character-output-stream + fundamental-character-stream + fundamental-input-stream + fundamental-output-stream + fundamental-stream + input-stream-p + open-stream-p + output-stream-p + streamp) + + #-(or clim-uses-lisp-stream-functions Lucid) + (:shadow + clear-input + clear-output + close + finish-output + force-output + format + fresh-line + listen + pathname + peek-char + read-byte + read-char + read-char-no-hang + read-line + stream-element-type + terpri + truename + unread-char + with-open-stream + write-byte + write-char + write-string) + ;; Export symbols from Gray stream proposal, sigh (:export fundamental-binary-input-stream