From e5152ebe572654951e849ba89d2c8ba4d4223e80 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 24 May 2006 17:39:51 +0100
Subject: [PATCH] Porting stuff.

  * 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.
---
 infix.lisp    |  2 +-
 mdw-mop.lisp  |  2 +-
 optparse-test |  4 +++-
 sys-base.lisp | 39 ++++++++++++++-------------------------
 4 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/infix.lisp b/infix.lisp
index ea78422..9c77afe 100644
--- a/infix.lisp
+++ b/infix.lisp
@@ -70,7 +70,7 @@
   (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.
diff --git a/mdw-mop.lisp b/mdw-mop.lisp
index ff43c11..85e7885 100644
--- a/mdw-mop.lisp
+++ b/mdw-mop.lisp
@@ -27,7 +27,7 @@
 ;;; 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
diff --git a/optparse-test b/optparse-test
index 1d76566..83662c2 100755
--- a/optparse-test
+++ b/optparse-test
@@ -3,7 +3,9 @@
 (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)
diff --git a/sys-base.lisp b/sys-base.lisp
index b1e3595..ede099a 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -23,46 +23,35 @@
 ;;; 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
-  (:use #:common-lisp #+cmu #:extensions #+cmu #:mdw.runlisp)
+  (:use #:common-lisp #:runlisp)
   (: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)
 
-;;; --- 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))
 
-#+(or cmu)
+#-clisp
 (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))))
 
-(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.")
-- 
2.11.0