Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/lisp

* 'master' of metalzone.distorted.org.uk:~mdw/public-git/lisp:
  sys-base: Fix collection of command-line options for CLisp.
  mdw-mop: Move DEFGENERIC of SLOT-DEFINITION-FILTER.
  optparse-test: Fix to use cl-launch with /bin/sh hack.

Conflicts:
	sys-base.lisp

diff --git a/mdw-mop.lisp b/mdw-mop.lisp
index e813f97..7af8ad9 100644 (file)
--- a/mdw-mop.lisp
+++ b/mdw-mop.lisp
@@ -221,13 +221,13 @@
     (Yes, I know that using functions would be nicer, but the MOP makes
     that surprisingly difficult.)"))
 
+(defgeneric slot-definition-filter (slot)
+  (:method ((slot slot-definition)) nil))
+
 (defclass filtered-direct-slot-definition
     (standard-direct-slot-definition)
   ((filter :initarg :filter :reader slot-definition-filter)))
 
-(defgeneric slot-definition-filter (slot)
-  (:method ((slot slot-definition)) nil))
-
 (defclass filtered-effective-slot-definition
     (standard-effective-slot-definition)
   ((filter :initarg :filter :accessor slot-definition-filter)))

diff --git a/optparse-test b/optparse-test
index cd1c4f9..da1028d 100755 (executable)
--- a/optparse-test
+++ b/optparse-test
@@ -1,16 +1,12 @@
-#! /usr/local/bin/runlisp
+#! /bin/sh
+#|
+exec cl-launch -s mdw -i "(load \"$0\")" -- "$0" "$@" || exit 1
+|#
 
 (cl:defpackage #:optparse-test
-  (:use #:common-lisp))
+  (:use #:common-lisp #:optparse))
 (cl:in-package #:optparse-test)
 
-(let ((*compile-verbose* nil)
-      (*load-verbose* nil))
-  (asdf:oos 'asdf:load-op "mdw" :verbose nil))
-(handler-case
-    (use-package '#:optparse)
-  (error (c) (invoke-debugger c)))
-
 (defvar opt-bool nil)
 (defvar opt-int nil)
 (defvar opt-list nil)

diff --git a/sys-base.lisp b/sys-base.lisp
index b852eb3..370e80e 100644 (file)
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -25,22 +25,21 @@
 
 (defpackage #:runlisp
   (:use #:common-lisp)
-  (:export #:*raw-command-line* #:*command-line* #:exit)
+  (:export #:*command-line* #:exit)
   #+clisp (:import-from #:ext #:exit))
 
 (defpackage #:mdw.sys-base
   (:use #:common-lisp #:runlisp)
   (:export #:exit #:hard-exit #:*program-name* #:*command-line*
           #:set-command-line-arguments)
-  (:import-from #:runlisp #:*raw-command-line* #:*command-line* #:exit))
+  (:import-from #:runlisp #:*command-line* #:exit))
 (in-package #:mdw.sys-base)
 
-(defvar *raw-command-line*)
 (defvar *command-line*)
 (defvar *program-name*)
 
 (defun set-command-line-arguments ()
-  (setf *raw-command-line*
+  (setf *command-line*
        (or (when (member :cl-launch *features*)
              (let* ((cll-package (find-package :cl-launch))
                     (name (funcall (intern "GETENV" cll-package)
@@ -53,13 +52,10 @@
            #+cmu ext:*command-line-strings*
            #+sbcl sb-ext:*posix-argv*
            #+ecl (loop from i below (ext:argc) collect (ext:argv i))
-           #+clisp (coerce (ext:argv) 'list)
+           #+clisp (loop with argv = (ext:argv)
+                         for i from 7 below (length argv)
+                         collect (aref argv i))
            '("<unknown-lisp>" "--" "<unknown-script>")))
-  (setf *command-line*
-       (or (when (member :cl-launched *features*)
-             *raw-command-line*)
-           (cdr (member "--" *raw-command-line* :test #'string=))
-           *raw-command-line*))
   (setf *program-name* (pathname-name (car *command-line*))))
 (set-command-line-arguments)