From 59c87c8e9f61ea4d42a3f2983084bbdf42e5154b Mon Sep 17 00:00:00 2001
From: dyb <dyb@scheme.com>
Date: Sun, 18 Feb 2018 20:41:15 -0500
Subject: [PATCH] minor corrections to 4.ms; updated
 root-experr-compile-{0,2}-f-f-f

original commit: 86591f9dd45f36aa0e7d320d2286ffdb1b49076e
---
 mats/4.ms                        |  8 ++++----
 mats/root-experr-compile-0-f-f-f | 17 +++++++++++++++++
 mats/root-experr-compile-2-f-f-f | 20 ++++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/mats/4.ms b/mats/4.ms
index 3177b42044..3d531e227f 100644
--- a/mats/4.ms
+++ b/mats/4.ms
@@ -1425,9 +1425,9 @@
   (procedure? (lambda (x) (fold-left x)))
   (procedure? (lambda (x) (fold-left x y)))
   (error? ; nonprocedure
-    (for-left 3 0 '()))
+    (fold-left 3 0 '()))
   (error? ; nonprocedure
-    (for-left 3 0 '() '()))
+    (fold-left 3 0 '() '()))
   (error? ; nonprocedure
     (fold-left 3 0 '(a b c)))
   (error? ; improper list
@@ -1553,9 +1553,9 @@
   (procedure? (lambda (x) (fold-right x)))
   (procedure? (lambda (x) (fold-right x y)))
   (error? ; nonprocedure
-    (for-right 3 0 '()))
+    (fold-right 3 0 '()))
   (error? ; nonprocedure
-    (for-right 3 0 '() '()))
+    (fold-right 3 0 '() '()))
   (error? ; nonprocedure
     (fold-right 3 0 '(a b c)))
   (error? ; improper list
diff --git a/mats/root-experr-compile-0-f-f-f b/mats/root-experr-compile-0-f-f-f
index d39d411c69..472415f8e6 100644
--- a/mats/root-experr-compile-0-f-f-f
+++ b/mats/root-experr-compile-0-f-f-f
@@ -269,6 +269,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat named-let: "incorrect argument count in call ((letrec ((...)) x) 3 4)".
 4.mo:Expected error in mat map: "map: 3 is not a procedure".
 4.mo:Expected error in mat map: "map: 3 is not a procedure".
+4.mo:Expected error in mat map: "map: 3 is not a procedure".
+4.mo:Expected error in mat map: "map: 3 is not a procedure".
 4.mo:Expected error in mat map: "map: 7 is not a procedure".
 4.mo:Expected error in mat map: "map: a is not a proper list".
 4.mo:Expected error in mat map: "map: (a . b) is not a proper list".
@@ -291,6 +293,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat map: "map: (a a a a a a ...) is circular".
 4.mo:Expected error in mat map: "map: (a a a a a a ...) is circular".
 4.mo:Expected error in mat fold-left: "fold-left: 3 is not a procedure".
+4.mo:Expected error in mat fold-left: "fold-left: 3 is not a procedure".
+4.mo:Expected error in mat fold-left: "fold-left: 3 is not a procedure".
 4.mo:Expected error in mat fold-left: "fold-left: a is not a proper list".
 4.mo:Expected error in mat fold-left: "fold-left: (a . b) is not a proper list".
 4.mo:Expected error in mat fold-left: "fold-left: (a a a a a a ...) is circular".
@@ -319,6 +323,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat fold-left: "fold-left: input list was altered during operation".
 4.mo:Expected error in mat fold-left: "fold-left: input list was altered during operation".
 4.mo:Expected error in mat fold-right: "fold-right: 3 is not a procedure".
+4.mo:Expected error in mat fold-right: "fold-right: 3 is not a procedure".
+4.mo:Expected error in mat fold-right: "fold-right: 3 is not a procedure".
 4.mo:Expected error in mat fold-right: "fold-right: a is not a proper list".
 4.mo:Expected error in mat fold-right: "fold-right: (a . b) is not a proper list".
 4.mo:Expected error in mat fold-right: "fold-right: (a a a a a a ...) is circular".
@@ -341,6 +347,9 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat fold-right: "fold-right: (a a a a a a ...) is circular".
 4.mo:Expected error in mat for-each: "for-each: 3 is not a procedure".
 4.mo:Expected error in mat for-each: "for-each: 3 is not a procedure".
+4.mo:Expected error in mat for-each: "for-each: 3 is not a procedure".
+4.mo:Expected error in mat for-each: "for-each: 3 is not a procedure".
+4.mo:Expected error in mat for-each: "for-each: 7 is not a procedure".
 4.mo:Expected error in mat for-each: "for-each: a is not a proper list".
 4.mo:Expected error in mat for-each: "for-each: (a . b) is not a proper list".
 4.mo:Expected error in mat for-each: "for-each: (a a a a a a ...) is circular".
@@ -374,6 +383,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat for-each: "for-each: input list was altered during operation".
 4.mo:Expected error in mat for-each: "for-each: input list was altered during operation".
 4.mo:Expected error in mat ormap: "ormap: 3 is not a procedure".
+4.mo:Expected error in mat ormap: "ormap: 3 is not a procedure".
+4.mo:Expected error in mat ormap: "ormap: 3 is not a procedure".
 4.mo:Expected error in mat ormap: "ormap: a is not a proper list".
 4.mo:Expected error in mat ormap: "ormap: (a . b) is not a proper list".
 4.mo:Expected error in mat ormap: "ormap: (a a a a a a ...) is circular".
@@ -407,6 +418,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat ormap: "ormap: input list was altered during operation".
 4.mo:Expected error in mat ormap: "ormap: input list was altered during operation".
 4.mo:Expected error in mat andmap: "andmap: 3 is not a procedure".
+4.mo:Expected error in mat andmap: "andmap: 3 is not a procedure".
+4.mo:Expected error in mat andmap: "andmap: 3 is not a procedure".
 4.mo:Expected error in mat andmap: "andmap: a is not a proper list".
 4.mo:Expected error in mat andmap: "andmap: (a . b) is not a proper list".
 4.mo:Expected error in mat andmap: "andmap: (a a a a a a ...) is circular".
@@ -440,6 +453,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat andmap: "andmap: input list was altered during operation".
 4.mo:Expected error in mat andmap: "andmap: input list was altered during operation".
 4.mo:Expected error in mat exists: "exists: 3 is not a procedure".
+4.mo:Expected error in mat exists: "exists: 3 is not a procedure".
+4.mo:Expected error in mat exists: "exists: 3 is not a procedure".
 4.mo:Expected error in mat exists: "exists: a is not a proper list".
 4.mo:Expected error in mat exists: "exists: (a . b) is not a proper list".
 4.mo:Expected error in mat exists: "exists: (a a a a a a ...) is circular".
@@ -473,6 +488,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat exists: "exists: input list was altered during operation".
 4.mo:Expected error in mat exists: "exists: input list was altered during operation".
 4.mo:Expected error in mat for-all: "for-all: 3 is not a procedure".
+4.mo:Expected error in mat for-all: "for-all: 3 is not a procedure".
+4.mo:Expected error in mat for-all: "for-all: 3 is not a procedure".
 4.mo:Expected error in mat for-all: "for-all: a is not a proper list".
 4.mo:Expected error in mat for-all: "for-all: (a . b) is not a proper list".
 4.mo:Expected error in mat for-all: "for-all: (a a a a a a ...) is circular".
diff --git a/mats/root-experr-compile-2-f-f-f b/mats/root-experr-compile-2-f-f-f
index f80aae1004..472415f8e6 100644
--- a/mats/root-experr-compile-2-f-f-f
+++ b/mats/root-experr-compile-2-f-f-f
@@ -268,6 +268,10 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat r6rs:case: "invalid syntax (case)".
 4.mo:Expected error in mat named-let: "incorrect argument count in call ((letrec ((...)) x) 3 4)".
 4.mo:Expected error in mat map: "map: 3 is not a procedure".
+4.mo:Expected error in mat map: "map: 3 is not a procedure".
+4.mo:Expected error in mat map: "map: 3 is not a procedure".
+4.mo:Expected error in mat map: "map: 3 is not a procedure".
+4.mo:Expected error in mat map: "map: 7 is not a procedure".
 4.mo:Expected error in mat map: "map: a is not a proper list".
 4.mo:Expected error in mat map: "map: (a . b) is not a proper list".
 4.mo:Expected error in mat map: "map: (a a a a a a ...) is circular".
@@ -289,6 +293,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat map: "map: (a a a a a a ...) is circular".
 4.mo:Expected error in mat map: "map: (a a a a a a ...) is circular".
 4.mo:Expected error in mat fold-left: "fold-left: 3 is not a procedure".
+4.mo:Expected error in mat fold-left: "fold-left: 3 is not a procedure".
+4.mo:Expected error in mat fold-left: "fold-left: 3 is not a procedure".
 4.mo:Expected error in mat fold-left: "fold-left: a is not a proper list".
 4.mo:Expected error in mat fold-left: "fold-left: (a . b) is not a proper list".
 4.mo:Expected error in mat fold-left: "fold-left: (a a a a a a ...) is circular".
@@ -317,6 +323,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat fold-left: "fold-left: input list was altered during operation".
 4.mo:Expected error in mat fold-left: "fold-left: input list was altered during operation".
 4.mo:Expected error in mat fold-right: "fold-right: 3 is not a procedure".
+4.mo:Expected error in mat fold-right: "fold-right: 3 is not a procedure".
+4.mo:Expected error in mat fold-right: "fold-right: 3 is not a procedure".
 4.mo:Expected error in mat fold-right: "fold-right: a is not a proper list".
 4.mo:Expected error in mat fold-right: "fold-right: (a . b) is not a proper list".
 4.mo:Expected error in mat fold-right: "fold-right: (a a a a a a ...) is circular".
@@ -338,6 +346,10 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat fold-right: "fold-right: (a a a a a a ...) is circular".
 4.mo:Expected error in mat fold-right: "fold-right: (a a a a a a ...) is circular".
 4.mo:Expected error in mat for-each: "for-each: 3 is not a procedure".
+4.mo:Expected error in mat for-each: "for-each: 3 is not a procedure".
+4.mo:Expected error in mat for-each: "for-each: 3 is not a procedure".
+4.mo:Expected error in mat for-each: "for-each: 3 is not a procedure".
+4.mo:Expected error in mat for-each: "for-each: 7 is not a procedure".
 4.mo:Expected error in mat for-each: "for-each: a is not a proper list".
 4.mo:Expected error in mat for-each: "for-each: (a . b) is not a proper list".
 4.mo:Expected error in mat for-each: "for-each: (a a a a a a ...) is circular".
@@ -371,6 +383,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat for-each: "for-each: input list was altered during operation".
 4.mo:Expected error in mat for-each: "for-each: input list was altered during operation".
 4.mo:Expected error in mat ormap: "ormap: 3 is not a procedure".
+4.mo:Expected error in mat ormap: "ormap: 3 is not a procedure".
+4.mo:Expected error in mat ormap: "ormap: 3 is not a procedure".
 4.mo:Expected error in mat ormap: "ormap: a is not a proper list".
 4.mo:Expected error in mat ormap: "ormap: (a . b) is not a proper list".
 4.mo:Expected error in mat ormap: "ormap: (a a a a a a ...) is circular".
@@ -404,6 +418,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat ormap: "ormap: input list was altered during operation".
 4.mo:Expected error in mat ormap: "ormap: input list was altered during operation".
 4.mo:Expected error in mat andmap: "andmap: 3 is not a procedure".
+4.mo:Expected error in mat andmap: "andmap: 3 is not a procedure".
+4.mo:Expected error in mat andmap: "andmap: 3 is not a procedure".
 4.mo:Expected error in mat andmap: "andmap: a is not a proper list".
 4.mo:Expected error in mat andmap: "andmap: (a . b) is not a proper list".
 4.mo:Expected error in mat andmap: "andmap: (a a a a a a ...) is circular".
@@ -437,6 +453,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat andmap: "andmap: input list was altered during operation".
 4.mo:Expected error in mat andmap: "andmap: input list was altered during operation".
 4.mo:Expected error in mat exists: "exists: 3 is not a procedure".
+4.mo:Expected error in mat exists: "exists: 3 is not a procedure".
+4.mo:Expected error in mat exists: "exists: 3 is not a procedure".
 4.mo:Expected error in mat exists: "exists: a is not a proper list".
 4.mo:Expected error in mat exists: "exists: (a . b) is not a proper list".
 4.mo:Expected error in mat exists: "exists: (a a a a a a ...) is circular".
@@ -470,6 +488,8 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat exists: "exists: input list was altered during operation".
 4.mo:Expected error in mat exists: "exists: input list was altered during operation".
 4.mo:Expected error in mat for-all: "for-all: 3 is not a procedure".
+4.mo:Expected error in mat for-all: "for-all: 3 is not a procedure".
+4.mo:Expected error in mat for-all: "for-all: 3 is not a procedure".
 4.mo:Expected error in mat for-all: "for-all: a is not a proper list".
 4.mo:Expected error in mat for-all: "for-all: (a . b) is not a proper list".
 4.mo:Expected error in mat for-all: "for-all: (a a a a a a ...) is circular".