From 1895248525bc94799d4282493b2d36c4af8ff540 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Tue, 18 Dec 2001 21:35:11 +0000 Subject: [PATCH] Eliminate references to EDWIN-SYNTAX-TABLE and CLASS-SYNTAX-TABLE. --- v7/src/edwin/autold.scm | 6 +- v7/src/edwin/clsmac.scm | 25 +- v7/src/edwin/decls.scm | 19 +- v7/src/edwin/dosshell.scm | 14 +- v7/src/edwin/ed-ffi.scm | 473 +++++++++++++------------------------- v7/src/edwin/edwin.pkg | 15 +- v7/src/edwin/filcom.scm | 6 +- v7/src/edwin/fileio.scm | 6 +- v7/src/edwin/macros.scm | 42 ++-- 9 files changed, 223 insertions(+), 383 deletions(-) diff --git a/v7/src/edwin/autold.scm b/v7/src/edwin/autold.scm index 32c7d9947..a09e066b3 100644 --- a/v7/src/edwin/autold.scm +++ b/v7/src/edwin/autold.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;;$Id: autold.scm,v 1.57 2001/03/21 19:25:13 cph Exp $ +;;;$Id: autold.scm,v 1.58 2001/12/18 21:34:52 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology ;;; @@ -176,7 +176,7 @@ Second arg is prefix arg when called interactively." (lambda (entry) (load (merge-pathnames (car entry) directory) (cadr entry) - edwin-syntax-table + (cadr entry) (or (null? (cddr entry)) (caddr entry)))) (cdr library))) (if (not (memq (car library) loaded-libraries)) @@ -224,4 +224,4 @@ Second arg PURIFY? means purify the file's contents after loading; (lambda () (fluid-let ((load/suppress-loading-message? #t) (*parser-canonicalize-symbols?* #t)) - (load filename environment edwin-syntax-table purify?))))))) \ No newline at end of file + (load filename environment environment purify?))))))) \ No newline at end of file diff --git a/v7/src/edwin/clsmac.scm b/v7/src/edwin/clsmac.scm index 916bd2c87..43978454c 100644 --- a/v7/src/edwin/clsmac.scm +++ b/v7/src/edwin/clsmac.scm @@ -1,8 +1,8 @@ ;;; -*-Scheme-*- ;;; -;;;$Id: clsmac.scm,v 1.3 1999/01/02 06:11:34 cph Exp $ +;;;$Id: clsmac.scm,v 1.4 2001/12/18 21:34:54 cph Exp $ ;;; -;;; Copyright (c) 1986, 1989, 1999 Massachusetts Institute of Technology +;;; Copyright (c) 1986, 1989, 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 @@ -16,7 +16,8 @@ ;;; ;;; 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. ;;;; Class/Object System @@ -28,13 +29,13 @@ ;;; likely will not ever, be supported as a part of the Scheme system. ;;; ****************************************************************** -(define class-syntax-table - (make-syntax-table edwin-syntax-table)) +(define window-environment + (->environment '(EDWIN WINDOW))) -(define ((scode-macro-spreader transform) expression) - (apply transform (cdr expression))) +(set-environment-syntax-table! window-environment + (make-syntax-table (->environment '(EDWIN)))) -(syntax-table-define class-syntax-table 'DEFINE-CLASS +(syntax-table/define window-environment 'DEFINE-CLASS (lambda (name superclass variables) (guarantee-symbol "Class name" name) (if (not (null? superclass)) @@ -49,20 +50,20 @@ ,(if (null? superclass) false superclass) ',variables)))) -(syntax-table-define class-syntax-table 'DEFINE-METHOD +(syntax-table/define window-environment 'DEFINE-METHOD (lambda (class bvl . body) (syntax-class-definition class bvl body (lambda (name expression) (make-syntax-closure (make-method-definition class name expression)))))) -(syntax-table-define class-syntax-table 'WITH-INSTANCE-VARIABLES +(syntax-table/define window-environment 'WITH-INSTANCE-VARIABLES (lambda (class self free-names . body) (guarantee-symbol "Self name" self) (make-syntax-closure (syntax-class-expression class self free-names body)))) -(syntax-table-define class-syntax-table '=> +(syntax-table/define window-environment '=> (lambda (object operation . arguments) (guarantee-symbol "Operation name" operation) (let ((obname (string->uninterned-symbol "object"))) @@ -71,7 +72,7 @@ ,obname ,@arguments))))) -(syntax-table-define class-syntax-table 'USUAL=> +(syntax-table/define window-environment 'USUAL=> (lambda (object operation . arguments) (guarantee-symbol "Operation name" operation) (if (not *class-name*) diff --git a/v7/src/edwin/decls.scm b/v7/src/edwin/decls.scm index f3ca1d515..eb861c7be 100644 --- a/v7/src/edwin/decls.scm +++ b/v7/src/edwin/decls.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: decls.scm,v 1.70 2001/02/05 18:55:48 cph Exp $ +$Id: decls.scm,v 1.71 2001/12/18 21:34:56 cph Exp $ Copyright (c) 1989-2001 Massachusetts Institute of Technology @@ -27,7 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (bin-file (lambda (file) (string-append file ".bin"))) (bin-time (lambda (file) (file-modification-time (bin-file file)))) (sf-dependent - (lambda (syntax-table) + (lambda (environment) (lambda (source . dependencies) (let ((reasons (let ((source-time (bin-time source))) @@ -56,18 +56,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. (write reason)) reasons) (newline) - (fluid-let ((sf/default-syntax-table - (lexical-reference (->environment '(EDWIN)) - syntax-table)) + (fluid-let ((sf/default-syntax-table environment) (sf/default-declarations (map (lambda (dependency) `(integrate-external ,dependency)) dependencies))) (sf source)))))))) - (sf-global (sf-dependent 'syntax-table/system-internal)) - (sf-edwin (sf-dependent 'edwin-syntax-table)) - (sf-class (sf-dependent 'class-syntax-table))) - (for-each sf-global + (sf-edwin (sf-dependent (->environment '(EDWIN)))) + (sf-class (sf-dependent (->environment '(EDWIN WINDOW))))) + (for-each sf-edwin '("ansi" "bios" "class" @@ -95,10 +92,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. "winren" "xform" "xterm")) - (sf-global "tterm" "termcap") + (sf-edwin "tterm" "termcap") (let ((includes '("struct" "comman" "modes" "buffer" "edtstr"))) (let loop ((files includes) (includes '())) - (if (not (null? files)) + (if (pair? files) (begin (apply sf-edwin (car files) includes) (loop (cdr files) (cons (car files) includes))))) diff --git a/v7/src/edwin/dosshell.scm b/v7/src/edwin/dosshell.scm index 2d160e7e7..0989891c8 100644 --- a/v7/src/edwin/dosshell.scm +++ b/v7/src/edwin/dosshell.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: dosshell.scm,v 1.4 1999/01/02 06:11:34 cph Exp $ +$Id: dosshell.scm,v 1.5 2001/12/18 21:34:59 cph Exp $ -Copyright (c) 1992-1999 Massachusetts Institute of Technology +Copyright (c) 1992-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,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. |# ;;;; Pseudo Shell subprocess in a buffer @@ -320,9 +321,4 @@ With argument, don't skip the prompt -- go straight to column 0." (define-variable-local-value! (mark-buffer output-mark) (ref-variable-object pseudo-shell-active?) false) - (message "Pseudo exitted")))))) - -;;; Edwin variables: -;;; scheme-environment: (->environment '(edwin)) -;;; scheme-syntax-table: (access edwin-syntax-table (->environment '(edwin))) -;;; End: + (message "Pseudo exitted")))))) \ No newline at end of file diff --git a/v7/src/edwin/ed-ffi.scm b/v7/src/edwin/ed-ffi.scm index 72197bc33..41583625e 100644 --- a/v7/src/edwin/ed-ffi.scm +++ b/v7/src/edwin/ed-ffi.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: ed-ffi.scm,v 1.51 2001/02/05 18:55:50 cph Exp $ +$Id: ed-ffi.scm,v 1.52 2001/12/18 21:35:01 cph Exp $ Copyright (c) 1990-2001 Massachusetts Institute of Technology @@ -24,317 +24,160 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;; This list must be kept in alphabetical order by filename. (standard-scheme-find-file-initialization - '#(("abbrev" (edwin) - edwin-syntax-table) - ("ansi" (edwin screen console-screen) - syntax-table/system-internal) - ("argred" (edwin command-argument) - edwin-syntax-table) - ("artdebug" (edwin debugger) - edwin-syntax-table) - ("autold" (edwin) - edwin-syntax-table) - ("autosv" (edwin) - edwin-syntax-table) - ("basic" (edwin) - edwin-syntax-table) - ("bios" (edwin screen console-screen) - syntax-table/system-internal) - ("bufcom" (edwin) - edwin-syntax-table) - ("buffer" (edwin) - edwin-syntax-table) - ("buffrm" (edwin window) - class-syntax-table) - ("bufinp" (edwin buffer-input-port) - syntax-table/system-internal) - ("bufmnu" (edwin buffer-menu) - edwin-syntax-table) - ("bufout" (edwin buffer-output-port) - syntax-table/system-internal) - ("bufset" (edwin) - edwin-syntax-table) - ("bufwfs" (edwin window) - class-syntax-table) - ("bufwin" (edwin window) - class-syntax-table) - ("bufwiu" (edwin window) - class-syntax-table) - ("bufwmc" (edwin window) - class-syntax-table) - ("c-mode" (edwin) - edwin-syntax-table) - ("calias" (edwin) - edwin-syntax-table) - ("cinden" (edwin c-indentation) - edwin-syntax-table) - ("class" (edwin) - syntax-table/system-internal) - ("clscon" (edwin class-constructor) - syntax-table/system-internal) - ("clsmac" (edwin class-macros) - syntax-table/system-internal) - ("comhst" (edwin) - edwin-syntax-table) - ("comint" (edwin) - edwin-syntax-table) - ("comatch" (edwin) - syntax-table/system-internal) - ("comman" (edwin) - edwin-syntax-table) - ("compile" (edwin) - edwin-syntax-table) - ("comred" (edwin command-reader) - edwin-syntax-table) - ("comtab" (edwin comtab) - edwin-syntax-table) - ("comwin" (edwin window combination) - class-syntax-table) - ("curren" (edwin) - edwin-syntax-table) - ("dabbrev" (edwin) - edwin-syntax-table) - ("debian-changelog" (edwin debian-changelog) - edwin-syntax-table) - ("debug" (edwin debugger) - edwin-syntax-table) - ("debuge" (edwin) - edwin-syntax-table) - ("dired" (edwin dired) - edwin-syntax-table) - ("diros2" (edwin dired) - edwin-syntax-table) - ("dirunx" (edwin dired) - edwin-syntax-table) - ("dirw32" (edwin dired) - edwin-syntax-table) - ("display" (edwin display-type) - syntax-table/system-internal) - ("docstr" (edwin) - edwin-syntax-table) - ("dos" (edwin) - edwin-syntax-table) - ("doscom" (edwin dosjob) - edwin-syntax-table) - ("dosfile" (edwin) - edwin-syntax-table) - ("dosproc" (edwin process) - edwin-syntax-table) - ("dosshell" (edwin dosjob) - edwin-syntax-table) - ("editor" (edwin) - edwin-syntax-table) - ("edtfrm" (edwin window) - class-syntax-table) - ("edtstr" (edwin) - edwin-syntax-table) - ("evlcom" (edwin) - edwin-syntax-table) - ("eystep" (edwin stepper) - edwin-syntax-table) - ("filcom" (edwin) - edwin-syntax-table) - ("fileio" (edwin) - edwin-syntax-table) - ("fill" (edwin) - edwin-syntax-table) - ("grpops" (edwin group-operations) - syntax-table/system-internal) - ("hlpcom" (edwin) - edwin-syntax-table) - ("htmlmode" (edwin) - edwin-syntax-table) - ("image" (edwin) - syntax-table/system-internal) - ("info" (edwin info) - edwin-syntax-table) - ("input" (edwin keyboard) - edwin-syntax-table) - ("intmod" (edwin inferior-repl) - edwin-syntax-table) - ("iserch" (edwin incremental-search) - edwin-syntax-table) - ("javamode" (edwin) - edwin-syntax-table) - ("key-w32" (edwin win32-keys) - edwin-syntax-table) - ("key-x11" (edwin x-keys) - edwin-syntax-table) - ("keymap" (edwin command-summary) - edwin-syntax-table) - ("keyparse" (edwin keyparser) - edwin-syntax-table) - ("kilcom" (edwin) - edwin-syntax-table) - ("kmacro" (edwin) - edwin-syntax-table) - ("lincom" (edwin) - edwin-syntax-table) - ("linden" (edwin lisp-indentation) - edwin-syntax-table) - ("loadef" (edwin) - edwin-syntax-table) - ("lspcom" (edwin) - edwin-syntax-table) - ("macros" (edwin macros) - syntax-table/system-internal) - ("make" () - syntax-table/system-internal) - ("malias" (edwin mail-alias) - edwin-syntax-table) - ("manual" (edwin) - edwin-syntax-table) - ("midas" (edwin) - edwin-syntax-table) - ("modefs" (edwin) - edwin-syntax-table) - ("modes" (edwin) - edwin-syntax-table) - ("modlin" (edwin modeline-string) - edwin-syntax-table) - ("modwin" (edwin window) - class-syntax-table) - ("motcom" (edwin) - edwin-syntax-table) - ("motion" (edwin) - syntax-table/system-internal) - ("mousecom" (edwin) - edwin-syntax-table) - ("nntp" (edwin nntp) - syntax-table/system-internal) - ("notify" (edwin) - edwin-syntax-table) - ("nvector" (edwin) - syntax-table/system-internal) - ("occur" (edwin occurrence) - edwin-syntax-table) - ("os2" (edwin) - edwin-syntax-table) - ("os2com" (edwin os2-commands) - edwin-syntax-table) - ("os2term" (edwin screen os2-screen) - syntax-table/system-internal) - ("outline" (edwin) - edwin-syntax-table) - ("pasmod" (edwin) - edwin-syntax-table) - ("paths" (edwin) - syntax-table/system-internal) - ("print" (edwin) - edwin-syntax-table) - ("process" (edwin process) - edwin-syntax-table) - ("prompt" (edwin prompt) - edwin-syntax-table) - ("pwedit" (edwin password-edit) - edwin-syntax-table) - ("pwparse" (edwin password-edit) - edwin-syntax-table) - ("rcsparse" (edwin rcs-parse) - syntax-table/system-internal) - ("reccom" (edwin rectangle) - edwin-syntax-table) - ("regcom" (edwin register-command) - edwin-syntax-table) - ("regexp" (edwin regular-expression) - edwin-syntax-table) - ("regops" (edwin) - syntax-table/system-internal) - ("rename" () - syntax-table/system-internal) - ("replaz" (edwin) - edwin-syntax-table) - ("rfc822" (edwin rfc822) - syntax-table/system-internal) - ("ring" (edwin) - syntax-table/system-internal) - ("rmail" (edwin rmail) - edwin-syntax-table) - ("rmailsrt" (edwin rmail) - edwin-syntax-table) - ("rmailsum" (edwin rmail) - edwin-syntax-table) - ("schmod" (edwin) - edwin-syntax-table) - ("scrcom" (edwin) - edwin-syntax-table) - ("screen" (edwin screen) - edwin-syntax-table) - ("search" (edwin) - syntax-table/system-internal) - ("sendmail" (edwin sendmail) - edwin-syntax-table) - ("sercom" (edwin) - edwin-syntax-table) - ("shell" (edwin) - edwin-syntax-table) - ("simple" (edwin) - syntax-table/system-internal) - ("snr" (edwin news-reader) - edwin-syntax-table) - ("sort" (edwin) - edwin-syntax-table) - ("strpad" (edwin) - syntax-table/system-internal) - ("strtab" (edwin) - syntax-table/system-internal) - ("struct" (edwin) - edwin-syntax-table) - ("syntax" (edwin) - edwin-syntax-table) - ("tagutl" (edwin tags) - edwin-syntax-table) - ("techinfo" (edwin) - edwin-syntax-table) - ("telnet" (edwin) - edwin-syntax-table) - ("termcap" (edwin screen console-screen) - syntax-table/system-internal) - ("texcom" (edwin) - edwin-syntax-table) - ("things" (edwin) - edwin-syntax-table) - ("tparse" (edwin) - edwin-syntax-table) - ("tterm" (edwin screen console-screen) - syntax-table/system-internal) - ("tximod" (edwin) - edwin-syntax-table) - ("txtprp" (edwin text-properties) - edwin-syntax-table) - ("undo" (edwin undo) - edwin-syntax-table) - ("unix" (edwin) - edwin-syntax-table) - ("utils" (edwin) - syntax-table/system-internal) - ("utlwin" (edwin window) - class-syntax-table) - ("vc" (edwin vc) - edwin-syntax-table) - ("verilog" (edwin verilog) - edwin-syntax-table) - ("vhdl" (edwin vhdl) - edwin-syntax-table) - ("webster" (edwin) - edwin-syntax-table) - ("win32" (edwin screen win32) - edwin-syntax-table) - ("win32com" (edwin win-commands) - edwin-syntax-table) - ("wincom" (edwin) - edwin-syntax-table) - ("window" (edwin window) - class-syntax-table) - ("winout" (edwin window-output-port) - syntax-table/system-internal) - ("winren" (edwin) - syntax-table/system-internal) - ("xcom" (edwin x-commands) - edwin-syntax-table) - ("xform" (edwin class-macros transform-instance-variables) - syntax-table/system-internal) - ("xmodef" (edwin) - edwin-syntax-table) - ("xterm" (edwin screen x-screen) - syntax-table/system-internal))) \ No newline at end of file + '#(("abbrev" (edwin)) + ("ansi" (edwin screen console-screen)) + ("argred" (edwin command-argument)) + ("artdebug" (edwin debugger)) + ("autold" (edwin)) + ("autosv" (edwin)) + ("basic" (edwin)) + ("bios" (edwin screen console-screen)) + ("bufcom" (edwin)) + ("buffer" (edwin)) + ("buffrm" (edwin window)) + ("bufinp" (edwin buffer-input-port)) + ("bufmnu" (edwin buffer-menu)) + ("bufout" (edwin buffer-output-port)) + ("bufset" (edwin)) + ("bufwfs" (edwin window)) + ("bufwin" (edwin window)) + ("bufwiu" (edwin window)) + ("bufwmc" (edwin window)) + ("c-mode" (edwin)) + ("calias" (edwin)) + ("cinden" (edwin c-indentation)) + ("class" (edwin)) + ("clscon" (edwin class-constructor)) + ("clsmac" (edwin class-macros)) + ("comhst" (edwin)) + ("comint" (edwin)) + ("comatch" (edwin)) + ("comman" (edwin)) + ("compile" (edwin)) + ("comred" (edwin command-reader)) + ("comtab" (edwin comtab)) + ("comwin" (edwin window combination)) + ("curren" (edwin)) + ("dabbrev" (edwin)) + ("debian-changelog" (edwin debian-changelog)) + ("debug" (edwin debugger)) + ("debuge" (edwin)) + ("dired" (edwin dired)) + ("diros2" (edwin dired)) + ("dirunx" (edwin dired)) + ("dirw32" (edwin dired)) + ("display" (edwin display-type)) + ("docstr" (edwin)) + ("dos" (edwin)) + ("doscom" (edwin dosjob)) + ("dosfile" (edwin)) + ("dosproc" (edwin process)) + ("dosshell" (edwin dosjob)) + ("editor" (edwin)) + ("edtfrm" (edwin window)) + ("edtstr" (edwin)) + ("evlcom" (edwin)) + ("eystep" (edwin stepper)) + ("filcom" (edwin)) + ("fileio" (edwin)) + ("fill" (edwin)) + ("grpops" (edwin group-operations)) + ("hlpcom" (edwin)) + ("htmlmode" (edwin)) + ("image" (edwin)) + ("info" (edwin info)) + ("input" (edwin keyboard)) + ("intmod" (edwin inferior-repl)) + ("iserch" (edwin incremental-search)) + ("javamode" (edwin)) + ("key-w32" (edwin win32-keys)) + ("key-x11" (edwin x-keys)) + ("keymap" (edwin command-summary)) + ("keyparse" (edwin keyparser)) + ("kilcom" (edwin)) + ("kmacro" (edwin)) + ("lincom" (edwin)) + ("linden" (edwin lisp-indentation)) + ("loadef" (edwin)) + ("lspcom" (edwin)) + ("macros" (edwin macros)) + ("make" ()) + ("malias" (edwin mail-alias)) + ("manual" (edwin)) + ("midas" (edwin)) + ("modefs" (edwin)) + ("modes" (edwin)) + ("modlin" (edwin modeline-string)) + ("modwin" (edwin window)) + ("motcom" (edwin)) + ("motion" (edwin)) + ("mousecom" (edwin)) + ("nntp" (edwin nntp)) + ("notify" (edwin)) + ("nvector" (edwin)) + ("occur" (edwin occurrence)) + ("os2" (edwin)) + ("os2com" (edwin os2-commands)) + ("os2term" (edwin screen os2-screen)) + ("outline" (edwin)) + ("pasmod" (edwin)) + ("paths" (edwin)) + ("print" (edwin)) + ("process" (edwin process)) + ("prompt" (edwin prompt)) + ("pwedit" (edwin password-edit)) + ("pwparse" (edwin password-edit)) + ("rcsparse" (edwin rcs-parse)) + ("reccom" (edwin rectangle)) + ("regcom" (edwin register-command)) + ("regexp" (edwin regular-expression)) + ("regops" (edwin)) + ("rename" ()) + ("replaz" (edwin)) + ("rfc822" (edwin rfc822)) + ("ring" (edwin)) + ("rmail" (edwin rmail)) + ("rmailsrt" (edwin rmail)) + ("rmailsum" (edwin rmail)) + ("schmod" (edwin)) + ("scrcom" (edwin)) + ("screen" (edwin screen)) + ("search" (edwin)) + ("sendmail" (edwin sendmail)) + ("sercom" (edwin)) + ("shell" (edwin)) + ("simple" (edwin)) + ("snr" (edwin news-reader)) + ("sort" (edwin)) + ("strpad" (edwin)) + ("strtab" (edwin)) + ("struct" (edwin)) + ("syntax" (edwin)) + ("tagutl" (edwin tags)) + ("techinfo" (edwin)) + ("telnet" (edwin)) + ("termcap" (edwin screen console-screen)) + ("texcom" (edwin)) + ("things" (edwin)) + ("tparse" (edwin)) + ("tterm" (edwin screen console-screen)) + ("tximod" (edwin)) + ("txtprp" (edwin text-properties)) + ("undo" (edwin undo)) + ("unix" (edwin)) + ("utils" (edwin)) + ("utlwin" (edwin window)) + ("vc" (edwin vc)) + ("verilog" (edwin verilog)) + ("vhdl" (edwin vhdl)) + ("webster" (edwin)) + ("win32" (edwin screen win32)) + ("win32com" (edwin win-commands)) + ("wincom" (edwin)) + ("window" (edwin window)) + ("winout" (edwin window-output-port)) + ("winren" (edwin)) + ("xcom" (edwin x-commands)) + ("xform" (edwin class-macros transform-instance-variables)) + ("xmodef" (edwin)) + ("xterm" (edwin screen x-screen)))) \ No newline at end of file diff --git a/v7/src/edwin/edwin.pkg b/v7/src/edwin/edwin.pkg index d81e3a889..9349c93d2 100644 --- a/v7/src/edwin/edwin.pkg +++ b/v7/src/edwin/edwin.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: edwin.pkg,v 1.275 2001/10/30 19:25:15 cph Exp $ +$Id: edwin.pkg,v 1.276 2001/12/18 21:35:04 cph Exp $ Copyright (c) 1989-2001 Massachusetts Institute of Technology @@ -120,13 +120,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (define-package (edwin class-macros) (files "clsmac") - (parent ()) - (export (edwin) - class-syntax-table)) + (parent (edwin))) (define-package (edwin class-macros transform-instance-variables) (files "xform") - (parent ()) + (parent (edwin class-macros)) (export (edwin class-macros) transform-instance-variables)) @@ -143,14 +141,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (define-package (edwin macros) (files "macros") - (parent ()) - (export (edwin) - edwin-syntax-table) - (export (edwin class-macros) - edwin-syntax-table) + (parent (edwin)) (export (edwin) canonicalize-name command-name->scheme-name + edwin-syntax-table mode-name->scheme-name variable-name->scheme-name)) diff --git a/v7/src/edwin/filcom.scm b/v7/src/edwin/filcom.scm index c1e36cacd..cbf767963 100644 --- a/v7/src/edwin/filcom.scm +++ b/v7/src/edwin/filcom.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: filcom.scm,v 1.221 2001/12/17 04:41:46 cph Exp $ +;;; $Id: filcom.scm,v 1.222 2001/12/18 21:35:06 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology ;;; @@ -214,9 +214,7 @@ procedures are called." (catch-file-errors (lambda (condition) condition #f) (lambda () (fluid-let ((load/suppress-loading-message? #t)) - (load pathname - '(EDWIN) - edwin-syntax-table)))))))))) + (load pathname '(EDWIN))))))))))) (if (and (procedure? database) (procedure-arity-valid? database 1)) (database buffer) diff --git a/v7/src/edwin/fileio.scm b/v7/src/edwin/fileio.scm index c6b2ac988..e33b0cf02 100644 --- a/v7/src/edwin/fileio.scm +++ b/v7/src/edwin/fileio.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: fileio.scm,v 1.155 2001/07/06 21:14:38 cph Exp $ +;;; $Id: fileio.scm,v 1.156 2001/12/18 21:35:09 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology ;;; @@ -430,10 +430,10 @@ after you find a file. If you explicitly request such a scan with (loop start)))) (define (evaluate sexp) - (scode-eval (syntax sexp edwin-syntax-table) edwin-environment)) + (eval sexp edwin-environment)) (define edwin-environment - (->environment '(edwin))) + (->environment '(EDWIN))) initialize-buffer-local-variables!)) diff --git a/v7/src/edwin/macros.scm b/v7/src/edwin/macros.scm index 32648f08e..bb92fa91f 100644 --- a/v7/src/edwin/macros.scm +++ b/v7/src/edwin/macros.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: macros.scm,v 1.65 1999/11/01 03:40:23 cph Exp $ +;;; $Id: macros.scm,v 1.66 2001/12/18 21:35:11 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989-1999 Massachusetts Institute of Technology ;;; @@ -22,10 +22,20 @@ (declare (usual-integrations)) -(define edwin-syntax-table - (make-syntax-table syntax-table/system-internal)) +(define edwin-environment (->environment '(EDWIN))) +(define edwin-syntax-table edwin-environment) ;upwards compatibility -(syntax-table-define edwin-syntax-table 'DEFINE-COMMAND +(set-environment-syntax-table! edwin-environment + (make-syntax-table (->environment '()))) + +(let ((runtime-environment (->environment '(RUNTIME)))) + (for-each + (lambda (name) + (syntax-table/define edwin-environment name + (syntax-table/ref runtime-environment name))) + (syntax-table/defined-names runtime-environment))) + +(syntax-table/define edwin-environment 'DEFINE-COMMAND (lambda (name description interactive procedure) (let ((name (canonicalize-name name))) (let ((scheme-name (command-name->scheme-name name))) @@ -43,16 +53,16 @@ ,@(cddr procedure)) procedure))))))) -(syntax-table-define edwin-syntax-table 'REF-COMMAND-OBJECT +(syntax-table/define edwin-environment 'REF-COMMAND-OBJECT (lambda (name) (command-name->scheme-name (canonicalize-name name)))) -(syntax-table-define edwin-syntax-table 'REF-COMMAND +(syntax-table/define edwin-environment 'REF-COMMAND (lambda (name) `(COMMAND-PROCEDURE ,(command-name->scheme-name (canonicalize-name name))))) -(syntax-table-define edwin-syntax-table 'COMMAND-DEFINED? +(syntax-table/define edwin-environment 'COMMAND-DEFINED? (lambda (name) (let ((variable-name (command-name->scheme-name (canonicalize-name name)))) `(let ((env (->environment '(EDWIN)))) @@ -83,23 +93,23 @@ `((SET-VARIABLE-VALUE-NORMALIZATION! ,scheme-name ,normalization)))))))))) - (syntax-table-define edwin-syntax-table 'DEFINE-VARIABLE + (syntax-table/define edwin-environment 'DEFINE-VARIABLE (variable-definition false)) - (syntax-table-define edwin-syntax-table 'DEFINE-VARIABLE-PER-BUFFER + (syntax-table/define edwin-environment 'DEFINE-VARIABLE-PER-BUFFER (variable-definition true))) -(syntax-table-define edwin-syntax-table 'REF-VARIABLE-OBJECT +(syntax-table/define edwin-environment 'REF-VARIABLE-OBJECT (lambda (name) (variable-name->scheme-name (canonicalize-name name)))) -(syntax-table-define edwin-syntax-table 'REF-VARIABLE +(syntax-table/define edwin-environment 'REF-VARIABLE (lambda (name #!optional buffer) (let ((name (variable-name->scheme-name (canonicalize-name name)))) (if (default-object? buffer) `(VARIABLE-VALUE ,name) `(VARIABLE-LOCAL-VALUE ,buffer ,name))))) -(syntax-table-define edwin-syntax-table 'SET-VARIABLE! +(syntax-table/define edwin-environment 'SET-VARIABLE! (lambda (name #!optional value buffer) (let ((name (variable-name->scheme-name (canonicalize-name name))) (value (if (default-object? value) '#F value))) @@ -107,7 +117,7 @@ `(SET-VARIABLE-VALUE! ,name ,value) `(SET-VARIABLE-LOCAL-VALUE! ,buffer ,name ,value))))) -(syntax-table-define edwin-syntax-table 'LOCAL-SET-VARIABLE! +(syntax-table/define edwin-environment 'LOCAL-SET-VARIABLE! (lambda (name #!optional value buffer) `(DEFINE-VARIABLE-LOCAL-VALUE! ,(if (default-object? buffer) '(CURRENT-BUFFER) buffer) @@ -117,7 +127,7 @@ (define (variable-name->scheme-name name) (symbol-append 'EDWIN-VARIABLE$ name)) -(syntax-table-define edwin-syntax-table 'DEFINE-MAJOR-MODE +(syntax-table/define edwin-environment 'DEFINE-MAJOR-MODE (lambda (name super-mode-name display-name description #!optional initialization) (let ((name (canonicalize-name name)) @@ -147,7 +157,7 @@ (initialization) (else `(LAMBDA (BUFFER) BUFFER UNSPECIFIC))))))))) -(syntax-table-define edwin-syntax-table 'DEFINE-MINOR-MODE +(syntax-table/define edwin-environment 'DEFINE-MINOR-MODE (lambda (name display-name description #!optional initialization) (let ((name (canonicalize-name name))) `(DEFINE ,(mode-name->scheme-name name) @@ -161,7 +171,7 @@ initialization `(LAMBDA (BUFFER) BUFFER UNSPECIFIC))))))) -(syntax-table-define edwin-syntax-table 'REF-MODE-OBJECT +(syntax-table/define edwin-environment 'REF-MODE-OBJECT (lambda (name) (mode-name->scheme-name (canonicalize-name name)))) -- 2.25.1