[mcclim-cvs] CVS mcclim/Apps/Scigraph/dwim
crhodes
crhodes at common-lisp.net
Thu Mar 23 10:09:50 UTC 2006
Update of /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim
In directory clnet:/tmp/cvs-serv1310/Apps/Scigraph/dwim
Modified Files:
extensions.lisp package.lisp present.lisp tv.lisp wholine.lisp
Log Message:
Make Scigraph/dwim compile without error under SBCL.
The code is still a horrible mess of reader conditionals, feature case,
and other similar stuff; it really deserves to die a horrible death.
For now, though, put it on a life support machine.
--- /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/extensions.lisp 2004/08/06 13:19:40 1.5
+++ /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/extensions.lisp 2006/03/23 10:09:50 1.6
@@ -31,6 +31,7 @@
;;; Lisp Extensions
;;;*****************
+#-(and)
(unless (fboundp 'ignore)
;; Define IGNORE to be like our old friend from Genera.
;; This practice is frowned upon because IGNORE is in the
--- /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/package.lisp 2004/08/06 13:19:40 1.4
+++ /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/package.lisp 2006/03/23 10:09:50 1.5
@@ -87,6 +87,7 @@
;; March 1989, X3J13 votes to subsume downward-funarg & downward-function
;; by dynamic-extent. Get rid of the next two eventually. jpm.
dwim::downward-funarg dwim::downward-function
+ #-ansi-cl
dwim::dynamic-extent
dwim::array-register)))
--- /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/present.lisp 2004/08/06 13:19:40 1.3
+++ /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/present.lisp 2006/03/23 10:09:50 1.4
@@ -527,9 +527,10 @@
#+clim-0.9 nil
#+clim-1.0 clim:*activation-characters*))
(declare (ignore bchars))
+ (declare (ignorable achars))
#FEATURE-CASE
((:clim-0.9 (clim::activation-character-p char))
- (:clim-2 (ignore achars) (clim:activation-gesture-p char))
+ (:clim-2 (clim:activation-gesture-p char))
((or :clim-1.0 :clim-2 (not :clim))
(and
(if (consp char) (setq char (second char)) t)
@@ -548,9 +549,10 @@
(defun accept-blip-p (char &optional (chars #-clim dw::*accept-blip-chars*
#+clim-1.0 clim:*blip-characters*
#+clim-0.9 nil))
+ (declare (ignorable chars))
#FEATURE-CASE
((:clim-0.9 (clim::blip-character-p char))
- (:clim-2 (ignore chars) (clim:delimiter-gesture-p char))
+ (:clim-2 (clim:delimiter-gesture-p char))
((or :clim-1.0 :clim-2 (not :clim))
(loop for l in chars
thereis (and (characterp char) (member char l :test #'char-equal))))))
@@ -662,7 +664,7 @@
#-clim (dw:accept 'tv:sheet :stream stream :prompt nil))
:printer ((window stream)
(let ((*print-readably* nil))
- (declare (special *print-readably*))
+ #-ansi-cl (declare (special *print-readably*))
#+clim (format stream "~A" window)
#-clim (present window 'tv:sheet :stream stream)))
:description "a window")
@@ -690,12 +692,13 @@
(otherwise (present-to-string element))))
(defun make-accept-values-choices (&key query-identifier sequence select-action)
+ (declare (ignorable sequence))
#FEATURE-CASE
- ((:clim-2 (ignore sequence)
+ ((:clim-2
(clim-internals::make-accept-values-multiple-choices
:query-identifier query-identifier
:select-action select-action))
- (:clim-1.0 (ignore sequence)
+ (:clim-1.0
(clim::make-accept-values-multiple-choices
:query-identifier query-identifier
:select-action select-action))
@@ -710,12 +713,13 @@
(defun make-accept-values-choice (&key choices choice value documentation)
#+clim (declare (ignore documentation))
+ (declare (ignorable choice))
#FEATURE-CASE
- ((:clim-2 (ignore choice)
+ ((:clim-2
(clim-internals::make-accept-values-multiple-choice
:choices choices
:value value))
- (:clim-1.0 (ignore choice)
+ (:clim-1.0
(clim::make-accept-values-multiple-choice
:choices choices
:value value))
@@ -871,7 +875,7 @@
(accept 'string :stream stream :prompt nil :default nil)))
(:clim-1.0
(let ((clim::*disable-input-editor-echo* t))
- (ignore clim::*disable-input-editor-echo*)
+ (declare (ignorable clim::*disable-input-editor-echo*))
;; This variable is defined in a patch file (echo-patch.lisp)
;; that came from Scott MacKay and has not been made a part of DWIM.
;; You must load it separately.
@@ -907,5 +911,5 @@
:parser ((stream)
(values (readline-no-echo stream) 'invisible-object))
:printer ((object stream)
- (ignore object)
+ (declare (ignore object))
(write-string "*" stream)))
--- /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/tv.lisp 2004/08/06 13:19:40 1.7
+++ /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/tv.lisp 2006/03/23 10:09:50 1.8
@@ -363,7 +363,7 @@
((not :clim) (scl:send frame :superior))))
(defun find-frame-manager (&key (if-exists :reuse))
- (ignore if-exists)
+ (declare (ignorable if-exists))
#FEATURE-CASE
((:clim-2 (clim:find-frame-manager))
(:clim-1.0
@@ -384,10 +384,10 @@
(tv:console-default-superior))))))
(defun get-reusable-frame (manager type)
+ (declare (ignorable manager))
#FEATURE-CASE
(((not :clim)
(let ((choices *deactivated-frames*))
- (ignore manager)
(dolist (item choices)
(when (and (eq (frame-manager item) manager)
(typep (scl:send item :program) type))
@@ -401,7 +401,6 @@
(:clim-1.0
#-MCL
(let ((choices *deactivated-frames*))
- (ignore manager)
(dolist (item choices)
(when (typep item type)
(setq *deactivated-frames* (delete item *deactivated-frames*))
@@ -582,7 +581,6 @@
:left left :top top :right (+ left width) :bottom (+ top height)))
(:clim-2
;; what parent does this get?
- #-mcclim (ignore parent)
(let ((frame (clim:make-application-frame
type
:pretty-name title
--- /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/wholine.lisp 2003/10/31 11:35:37 1.1
+++ /project/mcclim/cvsroot/mcclim/Apps/Scigraph/dwim/wholine.lisp 2006/03/23 10:09:50 1.2
@@ -490,12 +490,12 @@
#+(or clim-1.0 clim-2)
(defmethod clim:read-frame-command :around ((frame t) &key stream)
- (ignore stream)
+ (declare (ignore stream))
(with-process-state (input-string) (call-next-method)))
#+(or clim-1.0 clim-2)
(defmethod clim:execute-frame-command :around ((frame t) command)
- (ignore command)
+ (declare (ignore command))
(with-process-state (run-string) (call-next-method)))
#-clim
More information about the Mcclim-cvs
mailing list