Fix some typos in recent changes to SF.

Thanks, mejja.

diff --git a/src/sf/object.scm b/src/sf/object.scm
index 44d877f83d2438888da268fccc028c78b21dccea..fbeba508ea387a034e5d74edb61768bdb8978ee4 100644 (file)
--- a/src/sf/object.scm
+++ b/src/sf/object.scm
@@ -279,7 +279,7 @@ USA.
 ;; True iff evaluation of expression has no side effects.
 (define (expression/effect-free? expression)
   (cond ((access? expression)
-        (expresssion/effect-free? (access/environment expresssion)))
+        (expression/effect-free? (access/environment expression)))
 
        ((combination? expression)
         (and (for-all? (combination/operands expression) expression/effect-free?)

diff --git a/src/sf/subst.scm b/src/sf/subst.scm
index 7b0d43268f9bb6315136257d5fe08ee48759d2d8..489c15bf0981f01dc8df4252254c9ecac8cae66d 100644 (file)
--- a/src/sf/subst.scm
+++ b/src/sf/subst.scm
@@ -260,7 +260,7 @@ USA.
   (cond ((and (expression/never-false? integrated-predicate)
              (noisy-test sf:enable-disjunction-folding? "Folding constant true disjunction"))
         ;; (or <exp1> <exp2>) => <exp1> if <exp1> is never false
-        predicate)
+        integrated-predicate)
 
        ((and (expression/call-to-not? integrated-predicate)
              (noisy-test sf:enable-disjunction-inversion? "Inverting disjunction"))
@@ -685,7 +685,7 @@ USA.
                    (else (dont-integrate))))
 
             ((IGNORE)
-             (ignored-variable-warning (variable/name variable))
+             (ignored-variable-warning (variable/name name))
              (dont-integrate))
 
             ((INTEGRATE INTEGRATE-OPERATOR)

diff --git a/src/sf/tables.scm b/src/sf/tables.scm
index 95d09296496fa6304d789ff4121b14a0b2db6bec..5378970b700607e7308657709e4505a9896bcdcb 100644 (file)
--- a/src/sf/tables.scm
+++ b/src/sf/tables.scm
@@ -150,8 +150,8 @@ USA.
          ((null? optional)
           (match-rest environment (procedure/rest procedure) remaining-operands))
          ;; impossible?
-         (else (error "INTERNAL ERROR: Required argument list is improper"
-                      required))))
+         (else (error "INTERNAL ERROR: Optional argument list is improper"
+                      optional))))
 
   (define (listify-tail operands)
     (fold-right