From 9edb983944ca868d1fe6493e29919b7a0e9c7b01 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Wed, 19 Dec 2001 21:52:41 +0000 Subject: [PATCH] Eliminate references to SYNTAX-TABLE/SYSTEM-INTERNAL. --- v7/src/6001/6001.sf | 19 ++++++++++++------- v7/src/pcsample/pcs.sf | 14 ++++++-------- v7/src/runtime/runtime.sf | 4 ++-- v7/src/swat/scheme/swat.cbf | 2 +- v7/src/swat/scheme/swat.sf | 16 +++++++--------- v7/src/wabbit/wabbit.sf | 14 ++++++-------- v7/src/win32/win32.sf | 13 +++++-------- 7 files changed, 39 insertions(+), 43 deletions(-) diff --git a/v7/src/6001/6001.sf b/v7/src/6001/6001.sf index ba02c51a6..d65cda898 100644 --- 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 505938083..690fe3129 100644 --- 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 0dbfa25ae..44872eac3 100644 --- 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 63c4631fd..405e5dfd0 100644 --- 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 80f5670ea..2f8bf0c7c 100644 --- 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 31e542a64..487cbd5b7 100644 --- 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 39efd9134..e80142444 100644 --- 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