Eliminate references to SYNTAX-TABLE/SYSTEM-INTERNAL.

diff --git a/v7/src/6001/6001.sf b/v7/src/6001/6001.sf
index ba02c51a62fe1e99de472ae9e4dd0242617decb6..d65cda8981db55d5c0b451eecb6c881b972b637e 100644 (file)
--- a/v7/src/6001/6001.sf
+++ b/v7/src/6001/6001.sf
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: 6001.sf,v 1.11 2001/08/15 03:08:50 cph Exp $
+$Id: 6001.sf,v 1.12 2001/12/19 21:47:48 cph Exp $
 
 Copyright (c) 1991-1999, 2001 Massachusetts Institute of Technology
 
@@ -20,13 +20,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 USA.
 |#
 
-(fluid-let ((sf/default-syntax-table syntax-table/system-internal))
-  (for-each sf-conditionally
-           '("arith" "make" "nodefs" "picture" "pic-reco" "pic-imag"
-                     "pic-read" "pic-ops")))
+(sf-conditionally "make")
+(sf-conditionally "nodefs")
+(sf-conditionally "pic-reco")
+(sf-conditionally "pic-imag")
+(sf-conditionally "pic-read")
+(sf-conditionally "pic-ops")
 
-(fluid-let ((sf/default-syntax-table
-            (access edwin-syntax-table (->environment '(edwin)))))
+(fluid-let ((sf/default-syntax-table (->environment '(RUNTIME))))
+  (sf-conditionally "arith")
+  (sf-conditionally "picture"))
+
+(fluid-let ((sf/default-syntax-table (->environment '(EDWIN))))
   (sf-conditionally "edextra")
   (sf-conditionally "floppy"))
 

diff --git a/v7/src/pcsample/pcs.sf b/v7/src/pcsample/pcs.sf
index 50593808381670c9d3fd247d88b027be9e6d4d86..690fe31295f9c319a2a800f905aa344d52ccdd7a 100644 (file)
--- a/v7/src/pcsample/pcs.sf
+++ b/v7/src/pcsample/pcs.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: pcs.sf,v 1.2 1999/01/02 06:11:34 cph Exp $
+$Id: pcs.sf,v 1.3 2001/12/19 21:48:49 cph Exp $
 
-Copyright (c) 1995, 1999 Massachusetts Institute of Technology
+Copyright (c) 1995, 1999, 2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,14 +16,12 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
 |#
 
-(fluid-let ((sf/default-syntax-table syntax-table/system-internal))
+(fluid-let ((sf/default-syntax-table (->environment '(RUNTIME))))
   (sf-directory "."))
 
 (load-option 'CREF)
-
-(cref/generate-constructors "pcs")
-(sf "pcs.con" "pcs.bco")
-(sf "pcs.ldr" "pcs.bld")
+(cref/generate-constructors "pcs")
\ No newline at end of file

diff --git a/v7/src/runtime/runtime.sf b/v7/src/runtime/runtime.sf
index 0dbfa25ae10b2ed5b05586cbc487f0f75f8a3d70..44872eac311f3cf2cd3245df2ebc9ef58c514388 100644 (file)
--- a/v7/src/runtime/runtime.sf
+++ b/v7/src/runtime/runtime.sf
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.sf,v 14.16 2001/09/25 05:12:08 cph Exp $
+$Id: runtime.sf,v 14.17 2001/12/19 21:49:15 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 |#
 
-(fluid-let ((sf/default-syntax-table syntax-table/system-internal))
+(fluid-let ((sf/default-syntax-table (->environment '(RUNTIME))))
   (sf-conditionally "char")
   (sf-conditionally "chrset")
   (sf-conditionally "gentag")

diff --git a/v7/src/swat/scheme/swat.cbf b/v7/src/swat/scheme/swat.cbf
index 63c4631fd08a4f8e0b3afbbaa0831efb80e233f0..405e5dfd026d618c7402a4ec98f7c32e81293f23 100644 (file)
--- a/v7/src/swat/scheme/swat.cbf
+++ b/v7/src/swat/scheme/swat.cbf
@@ -6,7 +6,7 @@
 ;;      (compile-bin-file filename)))
 ;;
 ;;
-;;(fluid-let ((sf/default-syntax-table syntax-table/system-internal)
+;;(fluid-let ((sf/default-syntax-table (->environment '(RUNTIME)))
 ;;         (sf/default-declarations (cons '(usual-integrations)
 ;;                                        sf/default-declarations)))
 ;;  (cf-conditionally "scc-macros")

diff --git a/v7/src/swat/scheme/swat.sf b/v7/src/swat/scheme/swat.sf
index 80f5670ea146bb6e3e7f3c8fb3404de8db7bff7a..2f8bf0c7ce204f66d84b0d31611f88df2ed7004c 100644 (file)
--- a/v7/src/swat/scheme/swat.sf
+++ b/v7/src/swat/scheme/swat.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: swat.sf,v 1.3 1999/01/02 06:19:10 cph Exp $
+$Id: swat.sf,v 1.4 2001/12/19 21:50:34 cph Exp $
 
-Copyright (c) 1993-1999 Massachusetts Institute of Technology
+Copyright (c) 1993-1999, 2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,14 +16,15 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
 |#
 
 ;;;; SWAT build process: syntaxing.
 
 (declare (usual-integrations))
 
-(fluid-let ((sf/default-syntax-table syntax-table/system-internal)
+(fluid-let ((sf/default-syntax-table (->environment '(RUNTIME)))
            (sf/default-declarations
             `((usual-integrations) ,@sf/default-declarations)))
 
@@ -54,10 +55,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     (sf-conditionally "simple")
     (sf-conditionally "canvas")
     (sf-conditionally "menu")
-    (sf-conditionally "text")
-    ))
+    (sf-conditionally "text")))
 
 ;;(load-option 'CREF)
-;;(cref/generate-constructors "swat")
-;;(sf "swat.con")
-;;(sf "swat.ldr")
\ No newline at end of file
+;;(cref/generate-constructors "swat")
\ No newline at end of file

diff --git a/v7/src/wabbit/wabbit.sf b/v7/src/wabbit/wabbit.sf
index 31e542a64bee31836dad41e74d6fb367fc7c08a1..487cbd5b7708c85852f2a12744992ba3b47f98e8 100644 (file)
--- a/v7/src/wabbit/wabbit.sf
+++ b/v7/src/wabbit/wabbit.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: wabbit.sf,v 1.3 1999/01/02 06:19:10 cph Exp $
+$Id: wabbit.sf,v 1.4 2001/12/19 21:51:00 cph Exp $
 
-Copyright (c) 1994, 1999 Massachusetts Institute of Technology
+Copyright (c) 1994, 1999, 2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,14 +16,12 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
 |#
 
-(fluid-let ((sf/default-syntax-table syntax-table/system-internal))
+(fluid-let ((sf/default-syntax-table (->environment '(RUNTIME))))
   (sf-directory "."))
 
 (load-option 'CREF)
-
-(cref/generate-constructors "wabbit")
-(sf "wabbit.con" "wabbit.bco")
-(sf "wabbit.ldr" "wabbit.bld")
+(cref/generate-constructors "wabbit")
\ No newline at end of file

diff --git a/v7/src/win32/win32.sf b/v7/src/win32/win32.sf
index 39efd9134303a87b0ddb6d7ee019b9fe6de6c791..e80142444dc57cd794340b8c8127eeb6b8a7a237 100644 (file)
--- a/v7/src/win32/win32.sf
+++ b/v7/src/win32/win32.sf
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: win32.sf,v 1.5 2001/08/17 05:31:43 cph Exp $
+$Id: win32.sf,v 1.6 2001/12/19 21:52:41 cph Exp $
 
 Copyright (c) 1993-1999, 2001 Massachusetts Institute of Technology
 
@@ -20,12 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 USA.
 |#
 
-
-(fluid-let ((sf/default-syntax-table syntax-table/system-internal))
+(fluid-let ((sf/default-syntax-table (->environment '(RUNTIME))))
   (for-each
     (lambda (names)
-             (sf/add-file-declarations! (car names)
-                                        `((integrate-external . ,(cdr names)))))
+      (sf/add-file-declarations! (car names)
+                                `((integrate-external . ,(cdr names)))))
     '(("module"     "winuser" "wingdi" "wt_user")
       ("graphics"   "winuser" "wingdi" "wt_user")
       ("win_ffi"    "winuser" "wingdi" "wt_user")
@@ -33,9 +32,7 @@ USA.
       ("dib"        "win_ffi")))
 
   (sf-conditionally "ffimacro")
-  (if (or (not (file-exists? "ffimacro.com"))
-         (> (file-modification-time "ffimacro.bin")
-            (file-modification-time "ffimacro.com")))
+  (if (file-modification-time<? "ffimacro.bin" "ffimacro.com")
       (cbf "ffimacro"))
   (load "ffimacro")