Fix references to string->symbol in loading sequence to use the

primitive.

diff --git a/v7/src/runtime/debug.scm b/v7/src/runtime/debug.scm
index 28d28089c24f2b8a6c49359bcee5e0b259de518a..c69e37123e26e496b73c80a1dd98fac0836dec77 100644 (file)
--- a/v7/src/runtime/debug.scm
+++ b/v7/src/runtime/debug.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/debug.scm,v 14.31 1991/11/26 07:05:17 cph Exp $
+$Id: debug.scm,v 14.32 1992/11/29 14:14:40 gjr Exp $
 
-Copyright (c) 1988-91 Massachusetts Institute of Technology
+Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -326,7 +326,8 @@ MIT in each case. |#
           (newline port)
           (write (stack-frame/return-address subproblem) port)))))
 
-(define subexpression-marker (string->symbol "###"))
+(define subexpression-marker
+  ((ucode-primitive string->symbol) "###"))
 
 (define (print-subproblem-environment dstate port)
   (let ((environment-list (dstate/environment-list dstate)))

diff --git a/v7/src/runtime/defstr.scm b/v7/src/runtime/defstr.scm
index 3759bd5ae5a8ed4356a5b6b83f3593e2ae4e158e..e61b6c2db5d4942843c2b274733005227d5325b5 100644 (file)
--- a/v7/src/runtime/defstr.scm
+++ b/v7/src/runtime/defstr.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/defstr.scm,v 14.18 1991/10/30 21:00:11 cph Exp $
+$Id: defstr.scm,v 14.19 1992/11/29 14:15:27 gjr Exp $
 
-Copyright (c) 1988-91 Massachusetts Institute of Technology
+Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -378,7 +378,7 @@ must be defined when the defstruct is evaluated.
     read-only?))
 
 (define-integrable structure
-  (string->symbol "#[defstruct-description]"))
+  ((ucode-primitive string->symbol) "#[defstruct-description]"))
 
 (define slot-assoc)
 
@@ -393,7 +393,7 @@ must be defined when the defstruct is evaluated.
       (named-structure/get-tag-description tag)))
 
 (define record-type-name-tag
-  (string->symbol "#[defstruct-tag]"))
+  ((ucode-primitive string->symbol) "#[defstruct-tag]"))
 
 (unparser/set-tagged-vector-method! record-type-name-tag
   (lambda (state record-type-name)

diff --git a/v7/src/runtime/infstr.scm b/v7/src/runtime/infstr.scm
index ad651b5fefe9243e279134a41f5ecf8fd99fa268..87505f02fc81fa8fe3a29c340f29f7abe72fe2e9 100644 (file)
--- a/v7/src/runtime/infstr.scm
+++ b/v7/src/runtime/infstr.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/infstr.scm,v 1.6 1992/05/26 21:33:17 mhwu Exp $
+$Id: infstr.scm,v 1.7 1992/11/29 14:16:51 gjr Exp $
 
 Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
@@ -47,11 +47,13 @@ MIT in each case. |#
   (cdr info-vector))
 
 (define-integrable dbg-info-vector-tag
-  (string->symbol "#[(runtime compiler-info)dbg-info-vector-tag]"))
+  ((ucode-primitive string->symbol)
+   "#[(runtime compiler-info)dbg-info-vector-tag]"))
 
 (define-structure (dbg-info
                   (named
-                   (string->symbol "#[(runtime compiler-info)dbg-info]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime compiler-info)dbg-info]"))
                   (conc-name dbg-info/))
   (expression false read-only true)    ;dbg-expression
   (procedures false read-only true)    ;vector of dbg-procedure
@@ -71,7 +73,7 @@ MIT in each case. |#
 
 (define-structure (dbg-expression
                   (named
-                   (string->symbol
+                   ((ucode-primitive string->symbol)
                     "#[(runtime compiler-info)dbg-expression]"))
                   (conc-name dbg-expression/))
   (block false read-only true)         ;dbg-block
@@ -83,7 +85,8 @@ MIT in each case. |#
 
 (define-structure (dbg-procedure
                   (named
-                   (string->symbol "#[(runtime compiler-info)dbg-procedure]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime compiler-info)dbg-procedure]"))
                   (constructor
                    make-dbg-procedure
                    (block label type name required optional rest auxiliary
@@ -111,7 +114,7 @@ MIT in each case. |#
 \f
 (define-structure (dbg-continuation
                   (named
-                   (string->symbol
+                   ((ucode-primitive string->symbol)
                     "#[(runtime compiler-info)dbg-continuation]"))
                   (conc-name dbg-continuation/))
   (block false read-only true)         ;dbg-block
@@ -129,7 +132,8 @@ MIT in each case. |#
 
 (define-structure (dbg-block
                   (named
-                   (string->symbol "#[(runtime compiler-info)dbg-block]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime compiler-info)dbg-block]"))
                   (constructor
                    make-dbg-block
                    (type parent original-parent layout stack-link))
@@ -144,7 +148,8 @@ MIT in each case. |#
 
 (define-structure (dbg-variable
                   (named
-                   (string->symbol "#[(runtime compiler-info)dbg-variable]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime compiler-info)dbg-variable]"))
                   (conc-name dbg-variable/))
   (name false read-only true)          ;symbol
   (type false read-only true)          ;normal, cell, integrated
@@ -156,7 +161,7 @@ MIT in each case. |#
       (macro (name)
        (let ((symbol (symbol-append 'DBG-BLOCK-NAME/ name)))
          `(DEFINE-INTEGRABLE ,symbol
-            ',(string->symbol
+            ',((ucode-primitive string->symbol)
                (string-append "#[(runtime compiler-info)"
                               (string-downcase (symbol->string symbol))
                               "]")))))))
@@ -216,7 +221,8 @@ MIT in each case. |#
 
 (define-structure (dbg-label-1
                   (named
-                   (string->symbol "#[(runtime compiler-info)dbg-label]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime compiler-info)dbg-label]"))
                   (constructor make-dbg-label (name offset))
                   (conc-name dbg-label-1/))
   (name false)                         ;a string, primary name

diff --git a/v7/src/runtime/lambda.scm b/v7/src/runtime/lambda.scm
index 28241e48934bce62737db7e010b903ab29adc2d0..4b407a2630521256857a60697f065b8078db41ac 100644 (file)
--- a/v7/src/runtime/lambda.scm
+++ b/v7/src/runtime/lambda.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/lambda.scm,v 14.8 1991/02/15 18:06:07 cph Exp $
+$Id: lambda.scm,v 14.9 1992/11/29 14:17:42 gjr Exp $
 
-Copyright (c) 1988-91 Massachusetts Institute of Technology
+Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -442,7 +442,8 @@ MIT in each case. |#
 (define lambda-bound)
 
 (define-structure (block-declaration
-                  (named (string->symbol "#[Block Declaration]")))
+                  (named ((ucode-primitive string->symbol)
+                          "#[Block Declaration]")))
   (text false read-only true))
 \f
 ;;;; Simple Lambda/Lexpr
@@ -499,10 +500,10 @@ MIT in each case. |#
 ;;;; Internal Lambda
 
 (define-integrable lambda-tag:internal-lambda
-  (string->symbol "#[internal-lambda]"))
+  ((ucode-primitive string->symbol) "#[internal-lambda]"))
 
 (define-integrable lambda-tag:internal-lexpr
-  (string->symbol "#[internal-lexpr]"))
+  ((ucode-primitive string->symbol) "#[internal-lexpr]"))
 
 (define-integrable (make-internal-lambda names body)
   (make-slambda lambda-tag:internal-lambda names body))

diff --git a/v7/src/runtime/packag.scm b/v7/src/runtime/packag.scm
index 1ef590a2e4cb053ae998ae3d2fc9dd7819fd6991..ac41188f3b795849742ebbecf7314c9fdbcc1eb8 100644 (file)
--- a/v7/src/runtime/packag.scm
+++ b/v7/src/runtime/packag.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/packag.scm,v 14.10 1991/11/04 20:29:35 cph Exp $
+$Id: packag.scm,v 14.11 1992/11/29 14:18:20 gjr Exp $
 
-Copyright (c) 1988-91 Massachusetts Institute of Technology
+Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -79,7 +79,7 @@ MIT in each case. |#
              package))))
 
 (define-integrable package-name-tag
-  (string->symbol "#[(package)package-name-tag]"))
+  ((ucode-primitive string->symbol) "#[(package)package-name-tag]"))
 
 (define (find-package name)
   (let loop ((path name) (package system-global-package))

diff --git a/v7/src/runtime/pathnm.scm b/v7/src/runtime/pathnm.scm
index e252a8c23989fab4c84a23b95517b319437f8a51..896029747012e5729c51456bb06ace110f771bbc 100644 (file)
--- a/v7/src/runtime/pathnm.scm
+++ b/v7/src/runtime/pathnm.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/pathnm.scm,v 14.22 1992/08/12 09:31:41 jinx Exp $
+$Id: pathnm.scm,v 14.23 1992/11/29 14:19:50 gjr Exp $
 
 Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
@@ -106,7 +106,8 @@ these rules:
 |#
 \f
 (define-structure (pathname
-                  (named (string->symbol "#[(runtime pathname)pathname]"))
+                  (named ((ucode-primitive string->symbol)
+                          "#[(runtime pathname)pathname]"))
                   (constructor %make-pathname)
                   (conc-name %pathname-)
                   (print-procedure
@@ -450,7 +451,8 @@ these rules:
   (operation/pathname-canonicalize false read-only true))
 
 (define-structure (host
-                  (named (string->symbol "#[(runtime pathname)host]"))
+                  (named ((ucode-primitive string->symbol)
+                          "#[(runtime pathname)host]"))
                   (constructor %make-host)
                   (conc-name host/))
   (type-index false read-only true)

diff --git a/v7/src/runtime/record.scm b/v7/src/runtime/record.scm
index ba5625b53e7a588cd596fcd017f246cbde6e8b5b..2edaf9dccd77649d84aaf767ad66f945ab3fa39e 100644 (file)
--- a/v7/src/runtime/record.scm
+++ b/v7/src/runtime/record.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/record.scm,v 1.12 1991/11/26 06:50:09 cph Exp $
+$Id: record.scm,v 1.13 1992/11/29 14:20:27 gjr Exp $
 
-Copyright (c) 1989-91 Massachusetts Institute of Technology
+Copyright (c) 1989-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -42,7 +42,8 @@ MIT in each case. |#
 
 (define (initialize-package!)
   (set! record-type-marker
-       (string->symbol "#[(runtime record)record-type-marker]"))
+       ((ucode-primitive string->symbol)
+        "#[(runtime record)record-type-marker]"))
   (unparser/set-tagged-vector-method!
    record-type-marker
    (unparser/standard-method 'RECORD-TYPE-DESCRIPTOR

diff --git a/v7/src/runtime/scan.scm b/v7/src/runtime/scan.scm
index 4e76d327f6fc23157b5972cacf8585bb7c1b768c..7bad4fa4aae26e3f03986d0e219b8c807fca0e55 100644 (file)
--- a/v7/src/runtime/scan.scm
+++ b/v7/src/runtime/scan.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/scan.scm,v 14.4 1990/09/11 22:57:41 cph Rel $
+$Id: scan.scm,v 14.5 1992/11/29 14:21:09 gjr Exp $
 
-Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
+Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -54,7 +54,7 @@ MIT in each case. |#
 ;;; UNSCAN-DEFINES, respectively.
 
 (define-integrable open-block-tag
-  (string->symbol "#[open-block]"))
+  ((ucode-primitive string->symbol) "#[open-block]"))
 
 (define-integrable sequence-2-type
   (ucode-type sequence-2))

diff --git a/v7/src/runtime/syntax.scm b/v7/src/runtime/syntax.scm
index 003ed565efcc77c64bfda584f52e1f03fd3e942f..09bde6afb3773341205596734818690ca86db0fd 100644 (file)
--- a/v7/src/runtime/syntax.scm
+++ b/v7/src/runtime/syntax.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: syntax.scm,v 14.18 1992/11/03 22:41:38 jinx Exp $
+$Id: syntax.scm,v 14.19 1992/11/29 14:22:20 gjr Exp $
 
 Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
@@ -646,16 +646,16 @@ MIT in each case. |#
       (syntax-error "rebinding syntactic keyword" name)))
 
 (define-integrable lambda-tag:unnamed
-  (string->symbol "#[unnamed-procedure]"))
+  ((ucode-primitive string->symbol) "#[unnamed-procedure]"))
 
 (define-integrable lambda-tag:let
-  (string->symbol "#[let-procedure]"))
+  ((ucode-primitive string->symbol) "#[let-procedure]"))
 
 (define-integrable lambda-tag:fluid-let
-  (string->symbol "#[fluid-let-procedure]"))
+  ((ucode-primitive string->symbol) "#[fluid-let-procedure]"))
 
 (define-integrable lambda-tag:make-environment
-  (string->symbol "#[make-environment]"))
+  ((ucode-primitive string->symbol) "#[make-environment]"))
 \f
 ;;;; Lambda List Parser
 

diff --git a/v7/src/runtime/uenvir.scm b/v7/src/runtime/uenvir.scm
index 0fe572ba34c93974f27cbfe0f54f6cbe4e5c040c..441c76ff610180a45c7bddcb1dc0e9394efc05a1 100644 (file)
--- a/v7/src/runtime/uenvir.scm
+++ b/v7/src/runtime/uenvir.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/uenvir.scm,v 14.28 1992/08/04 23:48:59 cph Exp $
+$Id: uenvir.scm,v 14.29 1992/11/29 14:23:01 gjr Exp $
 
-Copyright (c) 1988-92 Massachusetts Institute of Technology
+Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -273,7 +273,8 @@ MIT in each case. |#
 
 (define-structure (stack-ccenv
                   (named
-                   (string->symbol "#[(runtime environment)stack-ccenv]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime environment)stack-ccenv]"))
                   (conc-name stack-ccenv/))
   (block false read-only true)
   (frame false read-only true)
@@ -517,7 +518,8 @@ MIT in each case. |#
 \f
 (define-structure (closure-ccenv
                   (named
-                   (string->symbol "#[(runtime environment)closure-ccenv]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime environment)closure-ccenv]"))
                   (conc-name closure-ccenv/))
   (stack-block false read-only true)
   (closure-block false read-only true)

diff --git a/v8/src/runtime/infstr.scm b/v8/src/runtime/infstr.scm
index 41ff97aa10e130aece73e8cba060dd04edf7e89d..87505f02fc81fa8fe3a29c340f29f7abe72fe2e9 100644 (file)
--- a/v8/src/runtime/infstr.scm
+++ b/v8/src/runtime/infstr.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/infstr.scm,v 1.6 1992/05/26 21:33:17 mhwu Exp $
+$Id: infstr.scm,v 1.7 1992/11/29 14:16:51 gjr Exp $
 
 Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
@@ -47,11 +47,13 @@ MIT in each case. |#
   (cdr info-vector))
 
 (define-integrable dbg-info-vector-tag
-  (string->symbol "#[(runtime compiler-info)dbg-info-vector-tag]"))
+  ((ucode-primitive string->symbol)
+   "#[(runtime compiler-info)dbg-info-vector-tag]"))
 
 (define-structure (dbg-info
                   (named
-                   (string->symbol "#[(runtime compiler-info)dbg-info]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime compiler-info)dbg-info]"))
                   (conc-name dbg-info/))
   (expression false read-only true)    ;dbg-expression
   (procedures false read-only true)    ;vector of dbg-procedure
@@ -71,7 +73,7 @@ MIT in each case. |#
 
 (define-structure (dbg-expression
                   (named
-                   (string->symbol
+                   ((ucode-primitive string->symbol)
                     "#[(runtime compiler-info)dbg-expression]"))
                   (conc-name dbg-expression/))
   (block false read-only true)         ;dbg-block
@@ -83,7 +85,8 @@ MIT in each case. |#
 
 (define-structure (dbg-procedure
                   (named
-                   (string->symbol "#[(runtime compiler-info)dbg-procedure]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime compiler-info)dbg-procedure]"))
                   (constructor
                    make-dbg-procedure
                    (block label type name required optional rest auxiliary
@@ -111,7 +114,7 @@ MIT in each case. |#
 \f
 (define-structure (dbg-continuation
                   (named
-                   (string->symbol
+                   ((ucode-primitive string->symbol)
                     "#[(runtime compiler-info)dbg-continuation]"))
                   (conc-name dbg-continuation/))
   (block false read-only true)         ;dbg-block
@@ -129,7 +132,8 @@ MIT in each case. |#
 
 (define-structure (dbg-block
                   (named
-                   (string->symbol "#[(runtime compiler-info)dbg-block]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime compiler-info)dbg-block]"))
                   (constructor
                    make-dbg-block
                    (type parent original-parent layout stack-link))
@@ -144,7 +148,8 @@ MIT in each case. |#
 
 (define-structure (dbg-variable
                   (named
-                   (string->symbol "#[(runtime compiler-info)dbg-variable]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime compiler-info)dbg-variable]"))
                   (conc-name dbg-variable/))
   (name false read-only true)          ;symbol
   (type false read-only true)          ;normal, cell, integrated
@@ -156,7 +161,7 @@ MIT in each case. |#
       (macro (name)
        (let ((symbol (symbol-append 'DBG-BLOCK-NAME/ name)))
          `(DEFINE-INTEGRABLE ,symbol
-            ',(string->symbol
+            ',((ucode-primitive string->symbol)
                (string-append "#[(runtime compiler-info)"
                               (string-downcase (symbol->string symbol))
                               "]")))))))
@@ -216,7 +221,8 @@ MIT in each case. |#
 
 (define-structure (dbg-label-1
                   (named
-                   (string->symbol "#[(runtime compiler-info)dbg-label]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime compiler-info)dbg-label]"))
                   (constructor make-dbg-label (name offset))
                   (conc-name dbg-label-1/))
   (name false)                         ;a string, primary name

diff --git a/v8/src/runtime/uenvir.scm b/v8/src/runtime/uenvir.scm
index 65a8665d6b333c87469c84bde798bcbdfee9c37f..441c76ff610180a45c7bddcb1dc0e9394efc05a1 100644 (file)
--- a/v8/src/runtime/uenvir.scm
+++ b/v8/src/runtime/uenvir.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/uenvir.scm,v 14.28 1992/08/04 23:48:59 cph Exp $
+$Id: uenvir.scm,v 14.29 1992/11/29 14:23:01 gjr Exp $
 
-Copyright (c) 1988-92 Massachusetts Institute of Technology
+Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -273,7 +273,8 @@ MIT in each case. |#
 
 (define-structure (stack-ccenv
                   (named
-                   (string->symbol "#[(runtime environment)stack-ccenv]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime environment)stack-ccenv]"))
                   (conc-name stack-ccenv/))
   (block false read-only true)
   (frame false read-only true)
@@ -517,7 +518,8 @@ MIT in each case. |#
 \f
 (define-structure (closure-ccenv
                   (named
-                   (string->symbol "#[(runtime environment)closure-ccenv]"))
+                   ((ucode-primitive string->symbol)
+                    "#[(runtime environment)closure-ccenv]"))
                   (conc-name closure-ccenv/))
   (stack-block false read-only true)
   (closure-block false read-only true)