From 3d3be8efd8503a913f2593db76e7410495a04fe5 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Thu, 12 Aug 1993 08:23:59 +0000 Subject: [PATCH] Change HOOK/REPL-EVAL to accept the calling REPL as its first argument, in addition to the other arguments. --- v7/src/runtime/load.scm | 5 +++-- v7/src/runtime/rep.scm | 9 ++++++--- v7/src/runtime/usrint.scm | 7 ++++--- v8/src/runtime/load.scm | 5 +++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/v7/src/runtime/load.scm b/v7/src/runtime/load.scm index 076125965..bc0f4f24c 100644 --- a/v7/src/runtime/load.scm +++ b/v7/src/runtime/load.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: load.scm,v 14.42 1993/03/13 05:39:16 jawilson Exp $ +$Id: load.scm,v 14.43 1993/08/12 08:23:59 cph Exp $ Copyright (c) 1988-1993 Massachusetts Institute of Technology @@ -280,7 +280,8 @@ MIT in each case. |# (repl/syntax-table repl) syntax-table)))) (lambda (s-expression) - (hook/repl-eval s-expression + (hook/repl-eval #f + s-expression environment syntax-table)))))) diff --git a/v7/src/runtime/rep.scm b/v7/src/runtime/rep.scm index a460cb270..959a474a1 100644 --- a/v7/src/runtime/rep.scm +++ b/v7/src/runtime/rep.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: rep.scm,v 14.32 1993/07/31 03:34:12 cph Exp $ +$Id: rep.scm,v 14.33 1993/08/12 08:23:44 cph Exp $ Copyright (c) 1988-93 Massachusetts Institute of Technology @@ -382,6 +382,7 @@ MIT in each case. |# repl (let ((value (hook/repl-eval + repl (let ((s-expression (hook/repl-prompt (string-append (number->string (cmdl/level repl)) @@ -400,7 +401,8 @@ MIT in each case. |# (prompt-for-command-expression prompt port)) (define hook/repl-eval) -(define (default/repl-eval s-expression environment syntax-table) +(define (default/repl-eval repl s-expression environment syntax-table) + repl (let ((scode (syntax s-expression syntax-table))) (with-new-history (lambda () (extended-scode-eval scode environment))))) @@ -714,7 +716,8 @@ MIT in each case. |# (define (re #!optional index) (let ((repl (nearest-repl))) - (hook/repl-eval (let ((history (repl/reader-history repl))) + (hook/repl-eval repl + (let ((history (repl/reader-history repl))) (let ((s-expression (repl-history/read history (if (default-object? index) diff --git a/v7/src/runtime/usrint.scm b/v7/src/runtime/usrint.scm index ef5ae4a1f..da03c35bb 100644 --- a/v7/src/runtime/usrint.scm +++ b/v7/src/runtime/usrint.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: usrint.scm,v 1.3 1992/11/12 03:25:49 gjr Exp $ +$Id: usrint.scm,v 1.4 1993/08/12 08:23:52 cph Exp $ -Copyright (c) 1991-1992 Massachusetts Institute of Technology +Copyright (c) 1991-93 Massachusetts Institute of Technology This material was developed by the Scheme project at the Massachusetts Institute of Technology, Department of Electrical Engineering and @@ -69,7 +69,8 @@ MIT in each case. |# (default/prompt-for-command-expression port (string-append prompt ":"))) (define (prompt-for-evaluated-expression prompt #!optional environment port) - (hook/repl-eval (prompt-for-expression prompt + (hook/repl-eval #f + (prompt-for-expression prompt (if (default-object? port) (nearest-cmdl/port) port)) diff --git a/v8/src/runtime/load.scm b/v8/src/runtime/load.scm index 076125965..bc0f4f24c 100644 --- a/v8/src/runtime/load.scm +++ b/v8/src/runtime/load.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: load.scm,v 14.42 1993/03/13 05:39:16 jawilson Exp $ +$Id: load.scm,v 14.43 1993/08/12 08:23:59 cph Exp $ Copyright (c) 1988-1993 Massachusetts Institute of Technology @@ -280,7 +280,8 @@ MIT in each case. |# (repl/syntax-table repl) syntax-table)))) (lambda (s-expression) - (hook/repl-eval s-expression + (hook/repl-eval #f + s-expression environment syntax-table)))))) -- 2.25.1