Update of /project/phemlock/cvsroot/phemlock/src/core
In directory common-lisp.net:/tmp/cvs-serv4954/src/core
Modified Files:
buffer.lisp decls.lisp display.lisp input.lisp interp.lisp
macros.lisp package.lisp ring.lisp rompsite.lisp screen.lisp
struct.lisp window.lisp
Log Message:
Changes to get rid of warnings and notes. As a side-effect, more code
has been commented out. There should be no more warnings nor notes
with CMUCL, and only two style warnings with SBCL. Not tested with
other implementations yet. TODO: spread key bindings to different
files.
Date: Sat Sep 4 01:06:52 2004
Author: abakic
Index: phemlock/src/core/buffer.lisp
diff -u phemlock/src/core/buffer.lisp:1.2 phemlock/src/core/buffer.lisp:1.3
--- phemlock/src/core/buffer.lisp:1.2 Tue Aug 10 14:47:06 2004
+++ phemlock/src/core/buffer.lisp Sat Sep 4 01:06:51 2004
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
#+CMU (ext:file-comment
- "$Header: /project/phemlock/cvsroot/phemlock/src/core/buffer.lisp,v 1.2 2004/08/10 12:47:06 rstrandh Exp $")
+ "$Header: /project/phemlock/cvsroot/phemlock/src/core/buffer.lisp,v 1.3 2004/09/03 23:06:51 abakic Exp $")
;;;
;;; **********************************************************************
;;;
@@ -15,6 +15,10 @@
;;;
(in-package :hemlock-internals)
+
+(declaim (special *current-buffer* ; because it is defined too late --amb
+ *global-variable-names* ; defined in main.lisp --amb
+ ))
;;;; Some buffer structure support.
Index: phemlock/src/core/decls.lisp
diff -u phemlock/src/core/decls.lisp:1.1 phemlock/src/core/decls.lisp:1.2
--- phemlock/src/core/decls.lisp:1.1 Fri Jul 9 17:00:36 2004
+++ phemlock/src/core/decls.lisp Sat Sep 4 01:06:51 2004
@@ -2,7 +2,7 @@
;;; Use #.*fast* for optimizations.
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :load-toplevel :execute)
(defparameter *fast*
'(declare (optimize speed)))
Index: phemlock/src/core/display.lisp
diff -u phemlock/src/core/display.lisp:1.1 phemlock/src/core/display.lisp:1.2
--- phemlock/src/core/display.lisp:1.1 Fri Jul 9 17:00:36 2004
+++ phemlock/src/core/display.lisp Sat Sep 4 01:06:51 2004
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
#+CMU (ext:file-comment
- "$Header: /project/phemlock/cvsroot/phemlock/src/core/display.lisp,v 1.1 2004/07/09 15:00:36 gbaumann Exp $")
+ "$Header: /project/phemlock/cvsroot/phemlock/src/core/display.lisp,v 1.2 2004/09/03 23:06:51 abakic Exp $")
;;;
;;; **********************************************************************
;;;
@@ -16,6 +16,7 @@
(in-package :hemlock-internals)
+(declaim (special *in-the-editor*)) ; defined in main.lisp --amb
;;;; Main redisplay entry points.
@@ -105,14 +106,15 @@
(setf ,n-res t)))
(device-force-output ,device)
,@(if afterp
- `(progn
- (device-after-redisplay ,device)
+ (list
+ `(progn
+ (device-after-redisplay ,device)
;; The after method may have queued input that the input
;; loop won't see until the next input arrives, so check
;; here to return the correct value as per the redisplay
;; contract.
(when (listen-editor-input *real-editor-input*)
- (setf ,n-res :editor-input))))
+ (setf ,n-res :editor-input)))))
,n-res)))))
) ;eval-when
Index: phemlock/src/core/input.lisp
diff -u phemlock/src/core/input.lisp:1.1 phemlock/src/core/input.lisp:1.2
--- phemlock/src/core/input.lisp:1.1 Fri Jul 9 17:00:36 2004
+++ phemlock/src/core/input.lisp Sat Sep 4 01:06:51 2004
@@ -7,7 +7,7 @@
(in-package :hemlock-internals)
#+CMU (ext:file-comment
- "$Header: /project/phemlock/cvsroot/phemlock/src/core/input.lisp,v 1.1 2004/07/09 15:00:36 gbaumann Exp $")
+ "$Header: /project/phemlock/cvsroot/phemlock/src/core/input.lisp,v 1.2 2004/09/03 23:06:51 abakic Exp $")
;;;
;;; **********************************************************************
;;;
@@ -337,7 +337,7 @@
(buffer (window-buffer window))
(start (buffer-start-mark buffer)))
(when (typep (hi::device-hunk-device (hi::window-hunk window))
- 'hi::bitmap-device)
+ (the class (class-of 'hi::bitmap-device)))
(let ((*more-prompt-action* :normal))
(update-modeline-field buffer window :more-prompt)
(random-typeout-redisplay window))
Index: phemlock/src/core/interp.lisp
diff -u phemlock/src/core/interp.lisp:1.2 phemlock/src/core/interp.lisp:1.3
--- phemlock/src/core/interp.lisp:1.2 Tue Aug 10 14:47:07 2004
+++ phemlock/src/core/interp.lisp Sat Sep 4 01:06:51 2004
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
#+CMU (ext:file-comment
- "$Header: /project/phemlock/cvsroot/phemlock/src/core/interp.lisp,v 1.2 2004/08/10 12:47:07 rstrandh Exp $")
+ "$Header: /project/phemlock/cvsroot/phemlock/src/core/interp.lisp,v 1.3 2004/09/03 23:06:51 abakic Exp $")
;;;
;;; **********************************************************************
;;;
@@ -16,6 +16,8 @@
;;;
(in-package :hemlock-internals)
+
+(declaim (special *echo-area-buffer*)) ; defined in echo.lisp --amb
(defun %print-hcommand (obj stream depth)
(declare (ignore depth))
Index: phemlock/src/core/macros.lisp
diff -u phemlock/src/core/macros.lisp:1.1 phemlock/src/core/macros.lisp:1.2
--- phemlock/src/core/macros.lisp:1.1 Fri Jul 9 17:00:36 2004
+++ phemlock/src/core/macros.lisp Sat Sep 4 01:06:51 2004
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
#+CMU (ext:file-comment
- "$Header: /project/phemlock/cvsroot/phemlock/src/core/macros.lisp,v 1.1 2004/07/09 15:00:36 gbaumann Exp $")
+ "$Header: /project/phemlock/cvsroot/phemlock/src/core/macros.lisp,v 1.2 2004/09/03 23:06:51 abakic Exp $")
;;;
;;; **********************************************************************
;;;
@@ -17,6 +17,7 @@
(in-package :hemlock-internals)
+(declaim (special *editor-input*)) ; defined in input --amb
;;;; Macros used for manipulating Hemlock variables.
Index: phemlock/src/core/package.lisp
diff -u phemlock/src/core/package.lisp:1.3 phemlock/src/core/package.lisp:1.4
--- phemlock/src/core/package.lisp:1.3 Tue Aug 10 07:58:04 2004
+++ phemlock/src/core/package.lisp Sat Sep 4 01:06:51 2004
@@ -101,6 +101,8 @@
#:delete-characters
#:delete-region
#:delete-and-save-region
+ #:fetch-cut-string
+ #:store-cut-string
#:filter-region
#:start-line-p
#:end-line-p
@@ -537,6 +539,7 @@
#:complete-file
#:default-directory
#:set-file-permissions
+ #:ambiguous-files
))
(defpackage :hemlock-internals
@@ -858,6 +861,13 @@
)
;; $Log: package.lisp,v $
+;; Revision 1.4 2004/09/03 23:06:51 abakic
+;; Changes to get rid of warnings and notes. As a side-effect, more code
+;; has been commented out. There should be no more warnings nor notes
+;; with CMUCL, and only two style warnings with SBCL. Not tested with
+;; other implementations yet. TODO: spread key bindings to different
+;; files.
+;;
;; Revision 1.3 2004/08/10 05:58:04 rstrandh
;; Removed logical-key-event-name and logical-key-event-documentation
;; as they were never used.
Index: phemlock/src/core/ring.lisp
diff -u phemlock/src/core/ring.lisp:1.2 phemlock/src/core/ring.lisp:1.3
--- phemlock/src/core/ring.lisp:1.2 Tue Aug 10 14:47:07 2004
+++ phemlock/src/core/ring.lisp Sat Sep 4 01:06:51 2004
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
#+CMU (ext:file-comment
- "$Header: /project/phemlock/cvsroot/phemlock/src/core/ring.lisp,v 1.2 2004/08/10 12:47:07 rstrandh Exp $")
+ "$Header: /project/phemlock/cvsroot/phemlock/src/core/ring.lisp,v 1.3 2004/09/03 23:06:51 abakic Exp $")
;;;
;;; **********************************************************************
;;;
@@ -18,6 +18,10 @@
(defun %print-hring (obj stream depth)
(declare (ignore depth obj))
(write-string "#<Hemlock Ring>" stream))
+
+(defun required-argument ()
+ "Portable surrogate of cmucl ext:required-argument. --amb"
+ (error "A required keyword argument was not supplied."))
;;;; The ring data structure:
;;;
Index: phemlock/src/core/rompsite.lisp
diff -u phemlock/src/core/rompsite.lisp:1.1 phemlock/src/core/rompsite.lisp:1.2
--- phemlock/src/core/rompsite.lisp:1.1 Fri Jul 9 17:00:36 2004
+++ phemlock/src/core/rompsite.lisp Sat Sep 4 01:06:51 2004
@@ -8,7 +8,7 @@
#+CMU
(ext:file-comment
- "$Header: /project/phemlock/cvsroot/phemlock/src/core/rompsite.lisp,v 1.1 2004/07/09 15:00:36 gbaumann Exp $")
+ "$Header: /project/phemlock/cvsroot/phemlock/src/core/rompsite.lisp,v 1.2 2004/09/03 23:06:51 abakic Exp $")
;;;
;;; **********************************************************************
;;;
@@ -205,6 +205,7 @@
#-(or sbcl CMU scl openmcl) (xlib:open-display "localhost"))
(setf *editor-input* (make-windowed-editor-input))
(setup-font-family *editor-windowed-input*))
+ #+nilamb
(t ;; The editor's file descriptor is Unix standard input (0).
;; We don't need to affect system:*file-input-handlers* here
;; because the init and exit methods for tty redisplay devices
@@ -258,6 +259,7 @@
;;; *BEEP-FUNCTION* and BEEP are in SYSTEM package in CMUCL.
;;;
(defvar *beep-function* #'(lambda (&optional stream)
+ (declare (ignorable stream))
(print "BEEP!" *trace-output*)
(finish-output *trace-output*)))
@@ -311,6 +313,9 @@
#+CMU (lisp::make-lisp-stream :in #'in-hemlock-standard-input-read)
#-CMU (make-broadcast-stream))
+(declaim (special *gc-notify-before*
+ *gc-notify-after*))
+
(defmacro site-wrapper-macro (&body body)
`(unwind-protect
(progn
@@ -333,10 +338,10 @@
(device-exit device))))
(defun standard-device-init ()
- (setup-input))
+ #+nilamb(setup-input))
(defun standard-device-exit ()
- (reset-input))
+ #+nilamb(reset-input))
(declaim (special *echo-area-window*))
@@ -521,6 +526,7 @@
"Takes a symbol or function and returns the pathname for the file the
function was defined in. If it was not defined in some file, nil is
returned."
+ #-CMU(declare (ignorable function))
#+CMU
(flet ((frob (code)
(let ((info (kernel:%code-debug-info code)))
Index: phemlock/src/core/screen.lisp
diff -u phemlock/src/core/screen.lisp:1.1 phemlock/src/core/screen.lisp:1.2
--- phemlock/src/core/screen.lisp:1.1 Fri Jul 9 17:00:36 2004
+++ phemlock/src/core/screen.lisp Sat Sep 4 01:06:51 2004
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
#+CMU (ext:file-comment
- "$Header: /project/phemlock/cvsroot/phemlock/src/core/screen.lisp,v 1.1 2004/07/09 15:00:36 gbaumann Exp $")
+ "$Header: /project/phemlock/cvsroot/phemlock/src/core/screen.lisp,v 1.2 2004/09/03 23:06:51 abakic Exp $")
;;;
;;; **********************************************************************
;;;
@@ -34,7 +34,7 @@
(value hemlock::default-status-line-fields))
(if (windowed-monitor-p)
(init-bitmap-screen-manager display)
- (init-tty-screen-manager (get-terminal-name))))
+ nil));(init-tty-screen-manager (get-terminal-name)))) ; disabled --amb
Index: phemlock/src/core/struct.lisp
diff -u phemlock/src/core/struct.lisp:1.2 phemlock/src/core/struct.lisp:1.3
--- phemlock/src/core/struct.lisp:1.2 Tue Aug 10 14:47:07 2004
+++ phemlock/src/core/struct.lisp Sat Sep 4 01:06:51 2004
@@ -7,7 +7,7 @@
(in-package :hemlock-internals)
#+CMU (ext:file-comment
- "$Header: /project/phemlock/cvsroot/phemlock/src/core/struct.lisp,v 1.2 2004/08/10 12:47:07 rstrandh Exp $")
+ "$Header: /project/phemlock/cvsroot/phemlock/src/core/struct.lisp,v 1.3 2004/09/03 23:06:51 abakic Exp $")
;;;
;;; **********************************************************************
;;;
@@ -592,7 +592,7 @@
:accessor tty-device-speed)))
(defun %make-tty-device (&rest initargs)
- (make-instance 'tty-device initargs))
+ (apply #'make-instance 'tty-device initargs))
;;;; Device screen hunks and window-group.
Index: phemlock/src/core/window.lisp
diff -u phemlock/src/core/window.lisp:1.2 phemlock/src/core/window.lisp:1.3
--- phemlock/src/core/window.lisp:1.2 Tue Aug 10 14:47:07 2004
+++ phemlock/src/core/window.lisp Sat Sep 4 01:06:51 2004
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
#+CMU (ext:file-comment
- "$Header: /project/phemlock/cvsroot/phemlock/src/core/window.lisp,v 1.2 2004/08/10 12:47:07 rstrandh Exp $")
+ "$Header: /project/phemlock/cvsroot/phemlock/src/core/window.lisp,v 1.3 2004/09/03 23:06:51 abakic Exp $")
;;;
;;; **********************************************************************
;;;
@@ -18,6 +18,8 @@
(in-package :hemlock-internals)
+(declaim (special *echo-area-buffer* ; defined in echo.lisp --amb
+ *things-to-do-once*)) ; defined in display.lisp --amb
;;;; CURRENT-WINDOW.
