Move command-line-processing code from (RUNTIME SAVE/RESTORE) package

to (RUNTIME LOAD) package.  Change INITIALIZE-PACKAGE! so that Scheme
initialization file is loaded before command line is processed.  This
allows initialization file to add command-line options.

diff --git a/v7/src/runtime/load.scm b/v7/src/runtime/load.scm
index 301dacde20902c55427a1e10ace9d2966e207147..9f8f63dc402991f59c2f9f7fa772ab4f5b8dda11 100644 (file)
--- a/v7/src/runtime/load.scm
+++ b/v7/src/runtime/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/load.scm,v 14.21 1991/04/15 20:47:37 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/load.scm,v 14.22 1991/05/03 17:54:29 arthur Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -38,13 +38,17 @@ MIT in each case. |#
 (declare (usual-integrations))
 \f
 (define (initialize-package!)
+  (set! hook/process-command-line default/process-command-line)
   (set! load-noisily? false)
   (set! load/loading? false)
   (set! load/suppress-loading-message? false)
   (set! load/default-types '("com" "bin" "scm"))
   (set! load/default-find-pathname-with-type search-types-in-order)
   (set! fasload/default-types '("com" "bin"))
-  (add-event-receiver! event:after-restart load-init-file))
+  (add-event-receiver! event:after-restart
+                      (lambda ()
+                        (load-init-file)
+                        (process-command-line))))
 
 (define load-noisily?)
 (define load/loading?)
@@ -287,4 +291,20 @@ MIT in each case. |#
              (write value)
              (loop (stream-car stream) (stream-cdr stream)))
            value))
-      unspecific))
\ No newline at end of file
+      unspecific))
+\f
+(define-primitives
+  (get-unused-command-line 0))
+
+(define (process-command-line)
+  (let ((unused-command-line
+        (and (implemented-primitive-procedure? get-unused-command-line)
+             (get-unused-command-line))))
+    (if unused-command-line
+       (hook/process-command-line unused-command-line))))
+
+(define hook/process-command-line)
+
+(define (default/process-command-line unused-command-line)
+  (if (positive? (vector-length unused-command-line))
+      (warn "unused command-line arguments" unused-command-line)))
\ No newline at end of file

diff --git a/v7/src/runtime/savres.scm b/v7/src/runtime/savres.scm
index f9cec06e1d22d8181fbf4acb39c4df4c1b2fad26..00fbe3ebc388e919104150232a747aabf148b39e 100644 (file)
--- a/v7/src/runtime/savres.scm
+++ b/v7/src/runtime/savres.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/savres.scm,v 14.17 1990/11/15 23:45:22 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/savres.scm,v 14.18 1991/05/03 17:54:09 arthur Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -51,9 +51,7 @@ MIT in each case. |#
 
 (define (initialize-package!)
   (set! disk-save (setup-image disk-save/kernel))
-  (set! dump-world (setup-image dump-world/kernel))
-  (set! hook/process-command-line default/process-command-line)
-  (add-event-receiver! event:after-restart process-command-line))
+  (set! dump-world (setup-image dump-world/kernel)))
 
 (define disk-save)
 (define dump-world)
@@ -87,22 +85,6 @@ MIT in each case. |#
               (else
                (event-distributor/invoke! event:after-restart)
                true)))))))
-
-(define-primitives
-  (get-unused-command-line 0))
-
-(define (process-command-line)
-  (let ((unused-command-line
-        (and (implemented-primitive-procedure? get-unused-command-line)
-             (get-unused-command-line))))
-    (if unused-command-line
-       (hook/process-command-line unused-command-line))))
-
-(define hook/process-command-line)
-
-(define (default/process-command-line unused-command-line)
-  (if (positive? (vector-length unused-command-line))
-      (warn "unused command-line arguments" unused-command-line)))
 \f
 (define (disk-save/kernel filename after-suspend after-restore)
   ((without-interrupts

diff --git a/v8/src/runtime/load.scm b/v8/src/runtime/load.scm
index 09c8beab4f3c15d20decc2db84b082dc6685b9a8..acbbc6f7facf9e8bd0653434566d872a0b7c2306 100644 (file)
--- a/v8/src/runtime/load.scm
+++ b/v8/src/runtime/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/load.scm,v 14.21 1991/04/15 20:47:37 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/load.scm,v 14.22 1991/05/03 17:54:29 arthur Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -38,13 +38,17 @@ MIT in each case. |#
 (declare (usual-integrations))
 \f
 (define (initialize-package!)
+  (set! hook/process-command-line default/process-command-line)
   (set! load-noisily? false)
   (set! load/loading? false)
   (set! load/suppress-loading-message? false)
   (set! load/default-types '("com" "bin" "scm"))
   (set! load/default-find-pathname-with-type search-types-in-order)
   (set! fasload/default-types '("com" "bin"))
-  (add-event-receiver! event:after-restart load-init-file))
+  (add-event-receiver! event:after-restart
+                      (lambda ()
+                        (load-init-file)
+                        (process-command-line))))
 
 (define load-noisily?)
 (define load/loading?)
@@ -287,4 +291,20 @@ MIT in each case. |#
              (write value)
              (loop (stream-car stream) (stream-cdr stream)))
            value))
-      unspecific))
\ No newline at end of file
+      unspecific))
+\f
+(define-primitives
+  (get-unused-command-line 0))
+
+(define (process-command-line)
+  (let ((unused-command-line
+        (and (implemented-primitive-procedure? get-unused-command-line)
+             (get-unused-command-line))))
+    (if unused-command-line
+       (hook/process-command-line unused-command-line))))
+
+(define hook/process-command-line)
+
+(define (default/process-command-line unused-command-line)
+  (if (positive? (vector-length unused-command-line))
+      (warn "unused command-line arguments" unused-command-line)))
\ No newline at end of file