From 48f04f55d8d383595a5fc5b9aebc3fbd75e1661a Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Sat, 15 Apr 1989 01:24:10 +0000 Subject: [PATCH] Use new procedure `%make-combination' to construct the combinations being returned. This is needed because one of those combinations might have failed because of a bad operand, and `make-combination' might try to constant fold the combination. The new procedure doesn't try to perform any constant folding. --- v7/src/runtime/framex.scm | 18 +++++++++--------- v8/src/runtime/framex.scm | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/v7/src/runtime/framex.scm b/v7/src/runtime/framex.scm index 50aa562a4..cbb2263ba 100644 --- a/v7/src/runtime/framex.scm +++ b/v7/src/runtime/framex.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/framex.scm,v 14.7 1989/04/05 04:30:25 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/framex.scm,v 14.8 1989/04/15 01:24:10 cph Rel $ Copyright (c) 1988, 1989 Massachusetts Institute of Technology @@ -131,13 +131,13 @@ MIT in each case. |# (values (stack-frame/ref frame 1) (stack-frame/ref frame 3))) (define (method/force-snap-thunk frame) - (values (make-combination + (values (%make-combination (ucode-primitive force 1) (list (make-evaluated-object (stack-frame/ref frame 1)))) undefined-environment)) (define ((method/application-frame index) frame) - (values (make-combination + (values (%make-combination (make-evaluated-object (stack-frame/ref frame index)) (stack-frame-list frame (1+ index))) undefined-environment)) @@ -161,13 +161,13 @@ MIT in each case. |# (stack-frame/ref frame 3))) (define (method/compiler-lookup-apply-restart frame) - (values (make-combination (stack-frame/ref frame 3) - (stack-frame-list frame 5)) + (values (%make-combination (stack-frame/ref frame 3) + (stack-frame-list frame 5)) undefined-environment)) (define (method/compiler-lookup-apply-trap-restart frame) - (values (make-combination (make-variable (stack-frame/ref frame 2)) - (stack-frame-list frame 6)) + (values (%make-combination (make-variable (stack-frame/ref frame 2)) + (stack-frame-list frame 6)) (stack-frame/ref frame 3))) (define (stack-frame-list frame start) @@ -254,8 +254,8 @@ MIT in each case. |# (,(method/compiler-reference (lambda (name) - (make-combination (ucode-primitive lexical-unbound?) - (list (make-the-environment) name)))) + (%make-combination (ucode-primitive lexical-unbound?) + (list (make-the-environment) name)))) COMPILER-UNBOUND?-RESTART) (,(method/compiler-assignment make-assignment-from-variable) diff --git a/v8/src/runtime/framex.scm b/v8/src/runtime/framex.scm index ca2559a7e..0887d5185 100644 --- a/v8/src/runtime/framex.scm +++ b/v8/src/runtime/framex.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/framex.scm,v 14.7 1989/04/05 04:30:25 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/framex.scm,v 14.8 1989/04/15 01:24:10 cph Rel $ Copyright (c) 1988, 1989 Massachusetts Institute of Technology @@ -131,13 +131,13 @@ MIT in each case. |# (values (stack-frame/ref frame 1) (stack-frame/ref frame 3))) (define (method/force-snap-thunk frame) - (values (make-combination + (values (%make-combination (ucode-primitive force 1) (list (make-evaluated-object (stack-frame/ref frame 1)))) undefined-environment)) (define ((method/application-frame index) frame) - (values (make-combination + (values (%make-combination (make-evaluated-object (stack-frame/ref frame index)) (stack-frame-list frame (1+ index))) undefined-environment)) @@ -161,13 +161,13 @@ MIT in each case. |# (stack-frame/ref frame 3))) (define (method/compiler-lookup-apply-restart frame) - (values (make-combination (stack-frame/ref frame 3) - (stack-frame-list frame 5)) + (values (%make-combination (stack-frame/ref frame 3) + (stack-frame-list frame 5)) undefined-environment)) (define (method/compiler-lookup-apply-trap-restart frame) - (values (make-combination (make-variable (stack-frame/ref frame 2)) - (stack-frame-list frame 6)) + (values (%make-combination (make-variable (stack-frame/ref frame 2)) + (stack-frame-list frame 6)) (stack-frame/ref frame 3))) (define (stack-frame-list frame start) @@ -254,8 +254,8 @@ MIT in each case. |# (,(method/compiler-reference (lambda (name) - (make-combination (ucode-primitive lexical-unbound?) - (list (make-the-environment) name)))) + (%make-combination (ucode-primitive lexical-unbound?) + (list (make-the-environment) name)))) COMPILER-UNBOUND?-RESTART) (,(method/compiler-assignment make-assignment-from-variable) -- 2.25.1