From dcc836cd808ff627f0a8b1f9c106fae2a55a3398 Mon Sep 17 00:00:00 2001 From: Joe Marshall Date: Mon, 6 Jun 2011 11:34:47 -0700 Subject: [PATCH] Trivial cleanup. --- src/sf/subst.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/sf/subst.scm b/src/sf/subst.scm index 4424c8bf9..c95d5bff0 100644 --- a/src/sf/subst.scm +++ b/src/sf/subst.scm @@ -717,13 +717,7 @@ USA. (let ((integration-failure (lambda () (variable/reference! variable) - (combination/make expression block operator operands))) - - (integration-success - (lambda (operator) - (variable/integrated! variable) - (integrate/combination expression operations environment - block operator operands)))) + (combination/make expression block operator operands)))) (operations/lookup operations variable (lambda (operation info) (case operation @@ -745,7 +739,10 @@ USA. (let ((new-expression (integrate/name expression operator info environment))) (if new-expression - (integration-success new-expression) + (begin + (variable/integrated! variable) + (integrate/combination expression operations environment + block new-expression operands)) (integration-failure)))) (else @@ -989,8 +986,7 @@ USA. (error "Unfinished integration" value) (if-value (delayed-integration/force value))) (if-value value))) - (lambda () - (if-not)) + if-not (lambda () (warn "Unable to integrate" (variable/name variable)) (if-not)))) -- 2.25.1