From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 19 May 2018 06:21:05 +0000 (-0700)
Subject: Split command-line processing out of load into its own file.
X-Git-Tag: mit-scheme-pucked-x11-0.3.1~7^2~31
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=a198d4330559e7dfc544fcfb25514799941c8912;p=mit-scheme.git

Split command-line processing out of load into its own file.

Also implement command-line for R7RS, renaming existing command-line to
command-line-arguments.
---

diff --git a/doc/user-manual/user.texinfo b/doc/user-manual/user.texinfo
index 8a60c8b24..bb526978f 100644
--- a/doc/user-manual/user.texinfo
+++ b/doc/user-manual/user.texinfo
@@ -731,24 +731,28 @@ during loading are silently ignored.
 
 @noindent
 The following options allow arguments to be passed to scripts via the
-@code{command-line} procedure.
+@code{command-line-arguments} procedure.
 
-@deffn procedure command-line
+@deffn procedure command-line-arguments
 Returns a list of arguments (strings) gathered from the command-line
 by options like @code{--args} or @code{--}.
+
+Note that this was named @code{command-line} in MIT/GNU Scheme release
+9.2 and earlier, but has been renamed to avoid a conflict with
+@acronym{R7RS}.
 @end deffn
 
 @item --args @var{argument} @dots{}
 @opindex --args
 This option causes Scheme to append the @var{argument}s, up
 to (but not including) the next argument that starts with a hyphen, to
-the list returned by the @code{command-line} procedure.
+the list returned by the @code{command-line-arguments} procedure.
 
 @item -- @var{argument} @dots{}
 @opindex --
 This option causes Scheme to append the rest of the command-line
 arguments (even those starting with a hyphen) to the list returned by
-the @code{command-line} procedure.
+the @code{command-line-arguments} procedure.
 @end table
 
 @noindent
diff --git a/src/runtime/command-line.scm b/src/runtime/command-line.scm
new file mode 100644
index 000000000..b34bd559c
--- /dev/null
+++ b/src/runtime/command-line.scm
@@ -0,0 +1,295 @@
+#| -*-Scheme-*-
+
+Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
+    1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+    2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+    2017 Massachusetts Institute of Technology
+
+This file is part of MIT/GNU Scheme.
+
+MIT/GNU Scheme is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+
+MIT/GNU Scheme is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with MIT/GNU Scheme; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+USA.
+
+|#
+
+;;;; Command-line processing
+;;; package: (runtime command-line)
+
+(declare (usual-integrations))
+
+(add-boot-init!
+ (lambda ()
+   (add-event-receiver! event:after-restart process-command-line)))
+
+(define (command-line)
+  (vector->list ((ucode-primitive get-command-line 0))))
+
+(define-deferred param:load-init-file?
+  (make-settable-parameter #t))
+
+(define *command-line-arguments*)
+
+(define (command-line-arguments)
+  *command-line-arguments*)
+
+(define (process-command-line)
+  (let ((after-parsing-actions '()))
+
+    (define (process-keyword command-line unused)
+      (if (pair? command-line)
+	  (let ((keyword (car command-line)))
+	    (if (option-keyword? keyword)
+		(let ((parser (find-keyword-parser keyword)))
+		  (if parser
+		      (receive (next tail-action) (parser command-line)
+			(if tail-action
+			    (set! after-parsing-actions
+				  (cons tail-action after-parsing-actions)))
+			(process-keyword next unused))
+		      (find-next-keyword command-line unused)))
+		(begin
+		  (warn "Invalid keyword:" keyword)
+		  (find-next-keyword command-line unused))))
+	  (done unused)))
+
+    (define (find-next-keyword command-line unused)
+      (let ((unused (cons (car command-line) unused))
+	    (command-line (cdr command-line)))
+	(if (pair? command-line)
+	    (if (option-keyword? (car command-line))
+		(process-keyword command-line unused)
+		(find-next-keyword command-line unused))
+	    (done unused))))
+
+    (define (done unused)
+      (if (pair? unused)
+	  (warn "Unhandled command line options:" (reverse unused))))
+
+    (set! *command-line-arguments* '())
+    (let ((unused (or ((ucode-primitive get-unused-command-line 0)) '#())))
+      (parameterize* (list (cons param:load-init-file? #t))
+	(lambda ()
+	  (process-keyword (vector->list unused) '())
+	  (for-each (lambda (act) (act))
+		    (reverse after-parsing-actions))
+	  (if (and (param:load-init-file?)
+		   (not (nearest-cmdl/batch-mode?)))
+	      (load-init-file)))))))
+
+(define (find-keyword-parser keyword)
+  (let ((entry (assoc (strip-leading-hyphens keyword) *command-line-parsers*)))
+    (and entry
+	 (cddr entry))))
+
+(define (option-keyword? argument)
+  (and (fix:> (string-length argument) 1)
+       (char=? #\- (string-ref argument 0))))
+
+(define (load-init-file)
+  (let ((pathname (init-file-pathname)))
+    (if pathname
+	(load pathname user-initial-environment)))
+  unspecific)
+
+(define *command-line-parsers* '())
+
+(define (set-command-line-parser! keyword proc #!optional description)
+  (guarantee string? keyword 'set-command-line-parser!)
+  (let ((keyword (strip-leading-hyphens keyword))
+	(desc (if (default-object? description)
+		  ""
+		  (begin
+		    (guarantee string? description
+			       'set-command-line-parser!)
+		    description))))
+
+    (let ((place (assoc keyword *command-line-parsers*)))
+      (if place
+	  (begin
+	    (set-car! (cdr place) desc)
+	    (set-cdr! (cdr place) proc))
+	  (begin
+	    (set! *command-line-parsers*
+		  (cons (cons* keyword desc proc)
+			*command-line-parsers*))
+	    unspecific)))))
+
+(define (strip-leading-hyphens keyword)
+  (let ((end (string-length keyword)))
+    (let loop ((start 0))
+      (cond ((and (fix:< start end)
+		  (char=? #\- (string-ref keyword start)))
+	     (loop (fix:+ start 1)))
+	    ((fix:= start 0)
+	     keyword)
+	    (else
+	     (string-slice keyword start end))))))
+
+(define (command-line-option-description keyword-line description-lines caller)
+  (if (pair? description-lines)
+      (if (and (null? (cdr description-lines))
+	       (not (car description-lines)))
+	  ""
+	  (begin
+	    (for-each (lambda (description-line)
+			(guarantee string? description-line caller))
+		      description-lines)
+	    (decorated-string-append "" "\n  " ""
+				     (cons keyword-line description-lines))))
+      (string-append keyword-line "\n  (No description.)")))
+
+(define (simple-command-line-parser keyword thunk . description-lines)
+  (guarantee string? keyword 'simple-command-line-parser)
+  (set-command-line-parser! keyword
+    (lambda (command-line)
+      (values (cdr command-line) thunk))
+    (command-line-option-description
+     (string-append "--" keyword)
+     description-lines
+     'simple-command-line-parser)))
+
+(define (argument-command-line-parser keyword multiple? procedure
+				      . description-lines)
+  (set-command-line-parser! keyword
+    (if multiple?
+	(lambda (command-line)
+	  (for-each-non-keyword (cdr command-line) procedure))
+	(lambda (command-line)
+	  (if (pair? (cdr command-line))
+	      (values (cddr command-line)
+		      (lambda () (procedure (cadr command-line))))
+	      (values '()
+		      (lambda ()
+			(warn "Missing argument to command-line option:"
+			      (string-append "--" keyword)))))))
+    (command-line-option-description
+     (string-append "--" keyword " ARG" (if multiple? " ..." ""))
+     description-lines
+     'argument-command-line-parser)))
+
+(define (for-each-non-keyword command-line processor)
+  (let ((end
+	 (lambda (command-line accum)
+	   (if (pair? accum)
+	       (let ((objects (reverse! accum)))
+		 (values command-line
+			 (lambda () (for-each processor objects))))
+	       (values command-line #f)))))
+    (let loop ((command-line command-line) (accum '()))
+      (if (pair? command-line)
+	  (let ((next (car command-line)))
+	    (if (option-keyword? next)
+		(end command-line accum)
+		(loop (cdr command-line) (cons next accum))))
+	  (end '() accum)))))
+
+(define (collect-args command-line)
+
+  (define-integrable (end unused args)
+    (set! *command-line-arguments*
+	  (append! *command-line-arguments* (reverse! args)))
+    (values unused #f))
+
+  (let loop ((unused (cdr command-line)) (args '()))
+    (if (pair? unused)
+	(let ((next (car unused)))
+	  (if (option-keyword? next)
+	      (end unused args)
+	      (loop (cdr unused) (cons next args))))
+	(end unused args))))
+
+(define (collect-remaining-args command-line)
+  (set! *command-line-arguments*
+	(append! *command-line-arguments* (cdr command-line)))
+  (values '() #f))
+
+(define (show-command-line-options)
+  (write-string "
+
+ADDITIONAL OPTIONS supported by this band:\n")
+  (do ((parsers (sort *command-line-parsers*
+		      (lambda (a b) (string<? (car a) (car b))))
+		(cdr parsers)))
+      ((null? parsers))
+    (let ((description (cadar parsers)))
+      (if (not (fix:= 0 (string-length description)))
+	  (begin
+	    (newline)
+	    (write-string description)
+	    (newline)))))
+  (exit))
+
+(add-boot-init!
+ (lambda ()
+
+   (simple-command-line-parser "no-init-file"
+     (lambda ()
+       (param:load-init-file? #f))
+     "Inhibits automatic loading of the ~/.scheme.init file.")
+
+   (simple-command-line-parser "suspend-file"
+     (lambda ()
+       (set! generate-suspend-file? #t)
+       unspecific)
+     "If specified, Scheme saves a band to ~/scheme_suspend on reception"
+     "of some signals.  This is unavailable on some operating systems."
+     "Under Unix, this is triggered by SIGUSR1 and SIGPWR, and also, if"
+     "Scheme is not running under Emacs, SIGHUP.")
+
+   (simple-command-line-parser "no-suspend-file"
+     (lambda ()
+       (set! generate-suspend-file? #f)
+       unspecific)
+     "Inhibits automatic saving of bands to ~/scheme_suspend.")
+
+   (argument-command-line-parser "load" #t
+     (lambda (arg)
+       (run-in-nearest-repl
+	(lambda (repl)
+	  (parameterize* (list (cons param:suppress-loading-message?
+				     (cmdl/batch-mode? repl)))
+	    (lambda ()
+	      (load arg (repl/environment repl)))))))
+     "Loads the argument files as if in the REPL."
+     "In batch mode, loading messages are suppressed.")
+
+   (argument-command-line-parser "eval" #t
+     (lambda (arg)
+       (run-in-nearest-repl
+	(lambda (repl)
+	  (let ((environment (repl/environment repl)))
+	    (repl-eval/write (read (open-input-string arg)
+				   environment)
+			     environment
+			     repl)))))
+     "Evaluates the argument expressions as if in the REPL.")
+
+   (simple-command-line-parser "help" show-command-line-options #f)
+
+   (simple-command-line-parser "version" (lambda () (exit)) #f)
+
+   (set-command-line-parser! "args" collect-args
+     (command-line-option-description
+      "--args ARG ..."
+      '("Appends ARGs (until the next keyword)"
+	"to the list (command-line-arguments).")
+      (default-object)))
+
+   (set-command-line-parser! "" collect-remaining-args
+     (command-line-option-description
+      "-- ARG ..."
+      '("Appends all ARGs (until the end of the command-line)"
+	"to the list (command-line-arguments).")
+      (default-object)))))
\ No newline at end of file
diff --git a/src/runtime/interrupt.scm b/src/runtime/interrupt.scm
index a17229581..f93b2f604 100644
--- a/src/runtime/interrupt.scm
+++ b/src/runtime/interrupt.scm
@@ -89,7 +89,7 @@ USA.
   (thread-timer-interrupt-handler))
 
 ;; This switch is set by the command-line initialization code.
-(define generate-suspend-file?)
+(define generate-suspend-file? #f)
 
 (define (suspend-interrupt-handler interrupt-code interrupt-enables)
   interrupt-code interrupt-enables
diff --git a/src/runtime/load.scm b/src/runtime/load.scm
index e33a90a7d..f3bd08708 100644
--- a/src/runtime/load.scm
+++ b/src/runtime/load.scm
@@ -28,35 +28,31 @@ USA.
 ;;; package: (runtime load)
 
 (declare (usual-integrations))
+
+(define *purification-root-marker*
+  '|#[PURIFICATION-ROOT]|)
+
+(define-deferred condition-type:not-loading
+  (make-condition-type 'not-loading condition-type:error '()
+    "No file being loaded."))
+
+(define-deferred param:after-load-hooks
+  (make-settable-parameter '()))
+
+(define-deferred param:current-load-environment
+  (make-settable-parameter #!default))
 
-(define (initialize-package!)
-  (set! *purification-root-marker* (intern "#[PURIFICATION-ROOT]"))
-  (set! condition-type:not-loading
-	(make-condition-type 'not-loading condition-type:error '()
-	  "No file being loaded."))
-
-  (set! param:after-load-hooks (make-settable-parameter '()))
-  (set! param:current-load-environment (make-settable-parameter #!default))
-  (set! param:eval-unit (make-unsettable-parameter #f))
-  (set! param:load-init-file? (make-settable-parameter #t))
-  (set! param:loading? (make-unsettable-parameter #f))
-  (set! param:suppress-loading-message? (make-settable-parameter #f))
-  (set! param:write-notifications? (make-unsettable-parameter #t))
-
-  (initialize-command-line-parsers)
-  (set! hook/process-command-line default/process-command-line)
-  (add-event-receiver! event:after-restart process-command-line))
-
-(define *purification-root-marker*)
-(define condition-type:not-loading)
-
-(define param:after-load-hooks)
-(define param:current-load-environment)
-(define param:eval-unit)
-(define param:load-init-file?)
-(define param:loading?)
-(define param:suppress-loading-message?)
-(define param:write-notifications?)
+(define-deferred param:eval-unit
+  (make-unsettable-parameter #f))
+
+(define-deferred param:loading?
+  (make-unsettable-parameter #f))
+
+(define-deferred param:suppress-loading-message?
+  (make-settable-parameter #f))
+
+(define-deferred param:write-notifications?
+  (make-unsettable-parameter #t))
 
 ;; Backwards compatibility:
 (define load/loading? #f)
@@ -464,268 +460,4 @@ USA.
 (define (maybe-merge rel-uri base-uri caller)
   (if (default-object? rel-uri)
       base-uri
-      (merge-uris (->relative-uri rel-uri caller) base-uri)))
-
-;;;; Command Line Parser
-
-(define (process-command-line)
-  (set! generate-suspend-file? #f)
-  (hook/process-command-line ((ucode-primitive get-unused-command-line 0))))
-
-(define *unused-command-line*)
-(define *command-line-parsers*)
-
-(define (command-line)
-  *command-line*)
-
-(define *command-line* '())
-
-(define hook/process-command-line)
-(define (default/process-command-line unused-command-line)
-  (let ((after-parsing-actions '()))
-
-    (define (process-keyword command-line unused)
-      (if (pair? command-line)
-	  (let ((keyword (car command-line)))
-	    (if (option-keyword? keyword)
-		(let ((parser (find-keyword-parser keyword)))
-		  (if parser
-		      (receive (next tail-action) (parser command-line)
-			(if tail-action
-			    (set! after-parsing-actions
-				  (cons tail-action after-parsing-actions)))
-			(process-keyword next unused))
-		      (find-next-keyword command-line unused)))
-		(begin
-		  (warn "Invalid keyword:" keyword)
-		  (find-next-keyword command-line unused))))
-	  (done unused)))
-
-    (define (find-next-keyword command-line unused)
-      (let ((unused (cons (car command-line) unused))
-	    (command-line (cdr command-line)))
-	(if (pair? command-line)
-	    (if (option-keyword? (car command-line))
-		(process-keyword command-line unused)
-		(find-next-keyword command-line unused))
-	    (done unused))))
-
-    (define (done unused)
-      (let ((unused (reverse! unused)))
-	(if (pair? unused)
-	    (warn "Unhandled command line options:" unused))
-	unused))
-
-    (if unused-command-line
-	(begin
-	  (set! *unused-command-line*)
-	  (parameterize* (list (cons param:load-init-file? #t))
-	    (lambda ()
-	      (set! *unused-command-line*
-		    (process-keyword (vector->list unused-command-line) '()))
-	      (for-each (lambda (act) (act))
-			(reverse after-parsing-actions))
-	      (if (and (param:load-init-file?)
-		       (not (nearest-cmdl/batch-mode?)))
-		  (load-init-file)))))
-	(begin
-	  (set! *unused-command-line* #f)
-	  (if (not (nearest-cmdl/batch-mode?))
-	      (load-init-file))))))
-
-(define (find-keyword-parser keyword)
-  (let ((entry (assoc (strip-leading-hyphens keyword) *command-line-parsers*)))
-    (and entry
-	 (cddr entry))))
-
-(define (option-keyword? argument)
-  (and (fix:> (string-length argument) 1)
-       (char=? #\- (string-ref argument 0))))
-
-(define (load-init-file)
-  (let ((pathname (init-file-pathname)))
-    (if pathname
-	(load pathname user-initial-environment)))
-  unspecific)
-
-(define (set-command-line-parser! keyword proc #!optional description)
-  (guarantee string? keyword 'set-command-line-parser!)
-  (let ((keyword (strip-leading-hyphens keyword))
-	(desc (if (default-object? description)
-		  ""
-		  (begin
-		    (guarantee string? description 'set-command-line-parser!)
-		    description))))
-
-    (let ((place (assoc keyword *command-line-parsers*)))
-      (if place
-	  (begin
-	    (set-car! (cdr place) desc)
-	    (set-cdr! (cdr place) proc))
-	  (begin
-	    (set! *command-line-parsers*
-		  (cons (cons* keyword desc proc)
-			*command-line-parsers*))
-	    unspecific)))))
-
-(define (strip-leading-hyphens keyword)
-  (let ((end (string-length keyword)))
-    (let loop ((start 0))
-      (cond ((and (fix:< start end)
-		  (char=? #\- (string-ref keyword start)))
-	     (loop (fix:+ start 1)))
-	    ((fix:= start 0)
-	     keyword)
-	    (else
-	     (substring keyword start end))))))
-
-(define (command-line-option-description keyword-line description-lines caller)
-  (if (pair? description-lines)
-      (if (and (null? (cdr description-lines))
-	       (not (car description-lines)))
-	  ""
-	  (begin
-	    (for-each (lambda (description-line)
-			(guarantee string? description-line caller))
-		      description-lines)
-	    (decorated-string-append "" "\n  " ""
-				     (cons keyword-line description-lines))))
-      (string-append keyword-line "\n  (No description.)")))
-
-(define (simple-command-line-parser keyword thunk . description-lines)
-  (guarantee string? keyword 'simple-command-line-parser)
-  (set-command-line-parser! keyword
-    (lambda (command-line)
-      (values (cdr command-line) thunk))
-    (command-line-option-description
-     (string-append "--" keyword)
-     description-lines
-     'simple-command-line-parser)))
-
-;; Upwards compatibility.
-(define simple-option-parser simple-command-line-parser)
-
-(define (argument-command-line-parser keyword multiple? procedure
-				      . description-lines)
-  (set-command-line-parser! keyword
-    (if multiple?
-	(lambda (command-line)
-	  (for-each-non-keyword (cdr command-line) procedure))
-	(lambda (command-line)
-	  (if (pair? (cdr command-line))
-	      (values (cddr command-line)
-		      (lambda () (procedure (cadr command-line))))
-	      (values '()
-		      (lambda ()
-			(warn "Missing argument to command-line option:"
-			      (string-append "--" keyword)))))))
-    (command-line-option-description
-     (string-append "--" keyword " ARG" (if multiple? " ..." ""))
-     description-lines
-     'argument-command-line-parser)))
-
-(define (for-each-non-keyword command-line processor)
-  (let ((end
-	 (lambda (command-line accum)
-	   (if (pair? accum)
-	       (let ((objects (reverse! accum)))
-		 (values command-line
-			 (lambda () (for-each processor objects))))
-	       (values command-line #f)))))
-    (let loop ((command-line command-line) (accum '()))
-      (if (pair? command-line)
-	  (let ((next (car command-line)))
-	    (if (option-keyword? next)
-		(end command-line accum)
-		(loop (cdr command-line) (cons next accum))))
-	  (end '() accum)))))
-
-(define (collect-args command-line)
-
-  (define-integrable (end unused args)
-    (set! *command-line* (append! *command-line* (reverse! args)))
-    (values unused #f))
-
-  (let loop ((unused (cdr command-line)) (args '()))
-    (if (pair? unused)
-	(let ((next (car unused)))
-	  (if (option-keyword? next)
-	      (end unused args)
-	      (loop (cdr unused) (cons next args))))
-	(end unused args))))
-
-(define (collect-remaining-args command-line)
-  (set! *command-line* (append! *command-line* (cdr command-line)))
-  (values '() #f))
-
-(define (show-command-line-options)
-  (write-string "
-
-ADDITIONAL OPTIONS supported by this band:\n")
-  (do ((parsers (sort *command-line-parsers*
-		      (lambda (a b) (string<? (car a) (car b))))
-		(cdr parsers)))
-      ((null? parsers))
-    (let ((description (cadar parsers)))
-      (if (not (fix:= 0 (string-length description)))
-	  (begin
-	    (newline)
-	    (write-string description)
-	    (newline)))))
-  (exit))
-
-(define (initialize-command-line-parsers)
-  (set! *command-line-parsers* '())
-  (simple-command-line-parser "no-init-file"
-    (lambda ()
-      (param:load-init-file? #f))
-    "Inhibits automatic loading of the ~/.scheme.init file.")
-  (set! generate-suspend-file? #f)
-  (simple-command-line-parser "suspend-file"
-    (lambda ()
-      (set! generate-suspend-file? #t)
-      unspecific)
-    "If specified, Scheme saves a band to ~/scheme_suspend on reception"
-    "of some signals.  This is unavailable on some operating systems."
-    "Under Unix, this is triggered by SIGUSR1 and SIGPWR, and also, if"
-    "Scheme is not running under Emacs, SIGHUP.")
-  (simple-command-line-parser "no-suspend-file"
-    (lambda ()
-      (set! generate-suspend-file? #f)
-      unspecific)
-    "Inhibits automatic saving of bands to ~/scheme_suspend.")
-  (argument-command-line-parser "load" #t
-    (lambda (arg)
-      (run-in-nearest-repl
-       (lambda (repl)
-	 (parameterize* (list (cons param:suppress-loading-message?
-				    (cmdl/batch-mode? repl)))
-	   (lambda ()
-	     (load arg (repl/environment repl)))))))
-    "Loads the argument files as if in the REPL."
-    "In batch mode, loading messages are suppressed.")
-  (argument-command-line-parser "eval" #t
-    (lambda (arg)
-      (run-in-nearest-repl
-       (lambda (repl)
-	 (let ((environment (repl/environment repl)))
-	   (repl-eval/write (read (open-input-string arg)
-				  environment)
-			    environment
-			    repl)))))
-    "Evaluates the argument expressions as if in the REPL.")
-  (simple-command-line-parser "help" show-command-line-options #f)
-  (simple-command-line-parser "version" (lambda () (exit)) #f)
-  (set-command-line-parser!
-   "args" collect-args
-   (command-line-option-description
-    "--args ARG ..."
-    '("Appends ARGs (up to the next keyword) to the list (command-line).")
-    'initialize-command-line-parsers))
-  (set-command-line-parser!
-   "" collect-remaining-args
-   (command-line-option-description
-    "-- ARG ..."
-    '("Appends all ARGs (to the end of the command-line) to the list"
-      "(command-line).")
-    'initialize-command-line-parsers)))
\ No newline at end of file
+      (merge-uris (->relative-uri rel-uri caller) base-uri)))
\ No newline at end of file
diff --git a/src/runtime/make.scm b/src/runtime/make.scm
index 8df7a12ce..4c7643943 100644
--- a/src/runtime/make.scm
+++ b/src/runtime/make.scm
@@ -514,6 +514,7 @@ USA.
    (runtime directory)
    (runtime working-directory)
    (runtime load)
+   (runtime command-line)
    (runtime simple-file-ops)
    (optional (runtime os-primitives) initialize-mime-types!)
    ;; Syntax
diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index df75573e3..1ffbb9ba9 100644
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -2833,7 +2833,7 @@ USA.
   (export (runtime emacs-interface)
 	  hook/^G-interrupt
 	  hook/clean-input/flush-typeahead)
-  (export (runtime load)
+  (export (runtime command-line)
 	  generate-suspend-file?)
   (export (runtime swank)
 	  keyboard-interrupt-vector)
@@ -3144,12 +3144,13 @@ USA.
 (define-package (runtime load)
   (files "load")
   (parent (runtime))
+  (export () deprecated:load
+	  load/loading?
+	  load/suppress-loading-message?)
   (export ()
 	  (load-latest load)
 	  (load-noisily load)
-	  argument-command-line-parser
 	  built-in-object-file
-	  command-line
 	  condition-type:not-loading
 	  current-eval-unit
 	  current-load-environment
@@ -3160,21 +3161,27 @@ USA.
 	  file-loadable?
 	  load
 	  load-library-object-file
-	  load/loading?
-	  load/purification-root
 	  load/push-hook!
-	  load/suppress-loading-message?
 	  param:loading?
 	  param:suppress-loading-message?
-	  set-command-line-parser!
 	  set-load-environment!
-	  simple-command-line-parser
 	  system-library-uri
 	  system-uri
 	  with-eval-unit
 	  with-load-environment
 	  with-loader-base-uri)
-  (initialization (initialize-package!)))
+  (export (runtime)
+	  load/purification-root))
+
+(define-package (runtime command-line)
+  (files "command-line")
+  (parent (runtime))
+  (export ()
+	  argument-command-line-parser
+	  command-line
+	  command-line-arguments
+	  set-command-line-parser!
+	  simple-command-line-parser))
 
 (define-package (runtime microcode-errors)
   (files "microcode-errors")