From 50eb7260ef041cea10ea91f3ddccf239f89a3ed9 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Wed, 19 Dec 2001 05:26:35 +0000 Subject: [PATCH] Delete SF/SET-DEFAULT-SYNTAX-TABLE!. --- v7/src/sf/sf.pkg | 3 +-- v7/src/sf/toplev.scm | 22 ++++++++++------------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/v7/src/sf/sf.pkg b/v7/src/sf/sf.pkg index fe8bd4b78..e453e3b13 100644 --- a/v7/src/sf/sf.pkg +++ b/v7/src/sf/sf.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: sf.pkg,v 4.13 2001/12/19 04:10:28 cph Exp $ +$Id: sf.pkg,v 4.14 2001/12/19 05:26:35 cph Exp $ Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology @@ -52,7 +52,6 @@ USA. sf/default-declarations sf/default-syntax-table sf/pathname-defaulting - sf/set-default-syntax-table! sf/set-file-syntax-table! sf/set-usual-integrations-default-deletions! sf/top-level-definitions diff --git a/v7/src/sf/toplev.scm b/v7/src/sf/toplev.scm index cdd419303..292f8f024 100644 --- a/v7/src/sf/toplev.scm +++ b/v7/src/sf/toplev.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: toplev.scm,v 4.17 2000/01/10 03:48:20 cph Exp $ +$Id: toplev.scm,v 4.18 2001/12/19 05:26:28 cph Exp $ -Copyright (c) 1988-2000 Massachusetts Institute of Technology +Copyright (c) 1988-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,7 +16,8 @@ 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. |# ;;;; SCode Optimizer: Top Level @@ -33,9 +34,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (lambda (*lambda environment) (scode-eval (integrate/scode *lambda declarations false) environment)))) -(define (integrate/sexp s-expression syntax-table declarations receiver) +(define (integrate/sexp s-expression environment declarations receiver) (integrate/simple (lambda (s-expressions) - (phase:syntax s-expressions syntax-table)) + (phase:syntax s-expressions environment)) (list s-expression) declarations receiver)) (define (integrate/scode scode declarations receiver) @@ -46,20 +47,17 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (and (not (default-object? bin-string)) bin-string) (and (not (default-object? spec-string)) spec-string))) -(define (syntax&integrate s-expression declarations #!optional syntax-table) +(define (syntax&integrate s-expression declarations #!optional environment) (fluid-let ((sf:noisy? false)) (integrate/sexp s-expression - (if (default-object? syntax-table) - (nearest-repl/syntax-table) - syntax-table) + (if (default-object? environment) + (nearest-repl/environment) + environment) declarations false))) (define sf:noisy? true) -(define (sf/set-default-syntax-table! syntax-table) - (set! sf/default-syntax-table syntax-table)) - (define (sf/set-file-syntax-table! pathname syntax-table) (pathname-map/insert! file-info/syntax-table (pathname/normalize pathname) -- 2.25.1