Move several definitions from here to more appropriate places.

diff --git a/v7/src/runtime/global.scm b/v7/src/runtime/global.scm
index 9319a6d4a31632cd89c3eb123bb886b399fa52a8..8c5532f2c196ff78270581defcba8ffa99c9dad0 100644 (file)
--- a/v7/src/runtime/global.scm
+++ b/v7/src/runtime/global.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/global.scm,v 14.2 1988/06/13 11:45:33 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/global.scm,v 14.3 1988/06/16 06:30:22 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -102,12 +102,6 @@ MIT in each case. |#
 (define-integrable (system-hunk3-cons type cxr0 cxr1 cxr2)
   (object-new-type type (hunk3-cons cxr0 cxr1 cxr2)))
 
-(define-integrable (symbol-hash symbol)
-  (string-hash (symbol->string symbol)))
-
-(define (symbol-append . symbols)
-  (string->symbol (apply string-append (map symbol->string symbols))))
-
 (define (bind-cell-contents! cell new-value thunk)
   (let ((old-value))
     (dynamic-wind (lambda ()
@@ -184,29 +178,6 @@ MIT in each case. |#
   (with-absolutely-no-interrupts (ucode-primitive halt))
   *the-non-printing-object*)
 
-(define (define-structure/keyword-parser argument-list default-alist)
-  (if (null? argument-list)
-      (map cdr default-alist)
-      (let ((alist
-            (map (lambda (entry) (cons (car entry) (cdr entry)))
-                 default-alist)))
-       (let loop ((arguments argument-list))
-         (if (not (null? arguments))
-             (begin
-               (if (null? (cdr arguments))
-                   (error "Keyword list does not have even length"
-                          argument-list))
-               (set-cdr! (or (assq (car arguments) alist)
-                             (error "Unknown keyword" (car arguments)))
-                         (cadr arguments))
-               (loop (cddr arguments)))))
-       (map cdr alist))))
-
-(define (syntaxer/cond-=>-helper form1-result thunk2 thunk3)
-  (if form1-result
-      ((thunk2) form1-result)
-      (thunk3)))
-
 (define syntaxer/default-environment
   (let () (the-environment)))
 

diff --git a/v8/src/runtime/global.scm b/v8/src/runtime/global.scm
index 76adce7ae266ec6b5ef5f0a64d2a5aa4def4609e..3e76d5dd5b015544a448623a6f495e07e8a72791 100644 (file)
--- a/v8/src/runtime/global.scm
+++ b/v8/src/runtime/global.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/global.scm,v 14.2 1988/06/13 11:45:33 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/global.scm,v 14.3 1988/06/16 06:30:22 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -102,12 +102,6 @@ MIT in each case. |#
 (define-integrable (system-hunk3-cons type cxr0 cxr1 cxr2)
   (object-new-type type (hunk3-cons cxr0 cxr1 cxr2)))
 
-(define-integrable (symbol-hash symbol)
-  (string-hash (symbol->string symbol)))
-
-(define (symbol-append . symbols)
-  (string->symbol (apply string-append (map symbol->string symbols))))
-
 (define (bind-cell-contents! cell new-value thunk)
   (let ((old-value))
     (dynamic-wind (lambda ()
@@ -184,29 +178,6 @@ MIT in each case. |#
   (with-absolutely-no-interrupts (ucode-primitive halt))
   *the-non-printing-object*)
 
-(define (define-structure/keyword-parser argument-list default-alist)
-  (if (null? argument-list)
-      (map cdr default-alist)
-      (let ((alist
-            (map (lambda (entry) (cons (car entry) (cdr entry)))
-                 default-alist)))
-       (let loop ((arguments argument-list))
-         (if (not (null? arguments))
-             (begin
-               (if (null? (cdr arguments))
-                   (error "Keyword list does not have even length"
-                          argument-list))
-               (set-cdr! (or (assq (car arguments) alist)
-                             (error "Unknown keyword" (car arguments)))
-                         (cadr arguments))
-               (loop (cddr arguments)))))
-       (map cdr alist))))
-
-(define (syntaxer/cond-=>-helper form1-result thunk2 thunk3)
-  (if form1-result
-      ((thunk2) form1-result)
-      (thunk3)))
-
 (define syntaxer/default-environment
   (let () (the-environment)))