* Change to use new runlisp system (rather than the bizarre hackery of
the same name which we had previously).
* Support ECL, as much as is sensible.
(name nil :type symbol)
(lprec nil :type (or fixnum null))
(rprec nil :type (or fixnum null))
(name nil :type symbol)
(lprec nil :type (or fixnum null))
(rprec nil :type (or fixnum null))
- (func (lambda () nil) :type (function () t)))
+ (func (lambda () nil) :type #-ecl (function () t) #+ecl function))
;;;--------------------------------------------------------------------------
;;; Global parser state.
;;;--------------------------------------------------------------------------
;;; Global parser state.
;;; Packages.
(defpackage #:mdw.mop
;;; Packages.
(defpackage #:mdw.mop
- (:use #:common-lisp #:mdw.base #+(or cmu clisp) #:mop)
+ (:use #:common-lisp #:mdw.base #+(or cmu clisp) #:mop #+ecl #:clos)
(:export #:copy-instance #:copy-instance-using-class
#:with-slot-variables
#:compatible-class
(:export #:copy-instance #:copy-instance-using-class
#:with-slot-variables
#:compatible-class
(let ((*compile-verbose* nil)
(*load-verbose* nil))
(asdf:oos 'asdf:load-op "mdw" :verbose nil))
(let ((*compile-verbose* nil)
(*load-verbose* nil))
(asdf:oos 'asdf:load-op "mdw" :verbose nil))
-(use-package '#:optparse)
+(handler-case
+ (use-package '#:optparse)
+ (error (c) (invoke-debugger c)))
(defvar opt-bool nil)
(defvar opt-int nil)
(defvar opt-bool nil)
(defvar opt-int nil)
;;; along with this program; if not, write to the Free Software Foundation,
;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
;;; along with this program; if not, write to the Free Software Foundation,
;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-(defpackage #:mdw.runlisp
- (:use #:common-lisp #+cmu #:extensions)
- (:export #:*lisp-interpreter* #:*command-line-strings*))
-(in-package #:mdw.runlisp)
-
-#+clisp
-(progn
- (defvar *lisp-interpreter*)
- (defvar *command-line-strings*)
- (let ((args (coerce (ext:argv) 'list)))
- (setf *lisp-interpreter* (car args))
- (setf *command-line-strings* (nthcdr 7 args))))
+(defpackage #:runlisp
+ (:use #:common-lisp)
+ (:export #:*lisp-interpreter* #:*command-line-strings* #:run))
(defpackage #:mdw.sys-base
(defpackage #:mdw.sys-base
- (:use #:common-lisp #+cmu #:extensions #+cmu #:mdw.runlisp)
+ (:use #:common-lisp #:runlisp)
(:export #:exit #:hard-exit #:*program-name* #:*command-line-strings*)
(:export #:exit #:hard-exit #:*program-name* #:*command-line-strings*)
- (:import-from #:mdw.runlisp #:*lisp-interpreter* #:*command-line-strings*)
+ (:import-from #:runlisp #:*lisp-interpreter* #:*command-line-strings*)
#+clisp (:import-from #:ext #:exit))
(in-package #:mdw.sys-base)
#+clisp (:import-from #:ext #:exit))
(in-package #:mdw.sys-base)
-;;; --- This is currently all a bit CMUCL-specific ---
+(defun hard-exit (&optional (code 0))
+ "Stops the program immediately in its tracks. Does nothing else. Use
+ after fork, for example, to avoid flushing buffers."
+ (declare (type (unsigned-byte 32) code))
+ #+cmu (unix::void-syscall ("_exit" c-call:int) code)
+ #+(or clisp ecl) (ext:quit code))
(defun exit (&optional (code 0))
"Polite way to end a program. If running in an interactive Lisp, just
return to the top-level REPL."
(defun exit (&optional (code 0))
"Polite way to end a program. If running in an interactive Lisp, just
return to the top-level REPL."
- (if #+cmu *batch-mode*
- #+cmu (throw 'lisp::%end-of-the-world code)
+ (if (boundp '*command-line-strings*)
+ #+(or cmu ecl) (ext:quit code)
(progn
(unless (zerop code)
(format t "~&Exiting unsuccessfully with code ~D.~%" code))
(abort))))
(progn
(unless (zerop code)
(format t "~&Exiting unsuccessfully with code ~D.~%" code))
(abort))))
-(defun hard-exit (&optional (code 0))
- "Stops the program immediately in its tracks. Does nothing else. Use
- after fork, for example, to avoid flushing buffers."
- (declare (type (unsigned-byte 32) code))
- #+cmu (unix::void-syscall ("_exit" c-call:int) code)
- #+clisp (ext:quit code))
-
(defvar *program-name*
(pathname-name (car *command-line-strings*))
"A plausible guess at the program's name, stripped of strange extensions.")
(defvar *program-name*
(pathname-name (car *command-line-strings*))
"A plausible guess at the program's name, stripped of strange extensions.")