Merge branch 'samth-date-isdst'

original commit: 295b09192fa3b0139d1b0b0ccc533d2d7d7195cc

LOG

@@ -493,3 +493,21 @@
   evaluation-order bug.
     cp0.ss,
     4.ms
+- added date-dst? to access the previously-hidden DST information in
+  date records, and added date-zone-name to provide a time zone name.
+    date.ss, primdata.ss,
+    stats.c,
+    date.ms, root-experr*, patch-compile*,
+    system.stex
+- fixed a bug in flonum-extractor, which on 64-bit machines was using an
+  8-byte read instead of a 4-byte read to pick up the 4 highest-order
+  bytes of a little-endian flonum, potentially reading past the end of
+  mapped memory for flonums produced by taking the imaginary part of an
+  inexact complexnum (which, unlike other flonums, are not aligned on
+  16-byte boundaries).  The 8-byte load would also have failed to produce
+  correct results on 64-bit big-endian machines (of which we presently
+  have none) because the offsets passed to flonum-extractor assume the
+  bits are in the lowest-order 4 bytes of the extracted field.
+    cp0.ss,
+    misc.ms,
+    release_notes.stex

c/stats.c

@@ -38,6 +38,8 @@
 
 static struct timespec starting_mono_tp;
 
+static long adjust_time_zone(ptr dtvec, struct tm *tmxp, ptr given_tzoff);
+
 /********  unique-id  ********/
 
 #if (time_t_bits == 32)
@@ -326,16 +328,16 @@ ptr S_gmtime(ptr tzoff, ptr tspair) {
   }
 
   if (tzoff == Sfalse) {
-    struct tm tmx2; time_t tx2;
     if (localtime_r(&tx, &tmx) == NULL) return Sfalse;
-    if (gmtime_r(&tx, &tmx2) == NULL) return Sfalse;
+    tmx.tm_isdst = -1; /* have mktime determine the DST status */
-    tmx2.tm_isdst = tmx.tm_isdst;
+    if (mktime(&tmx) == (time_t)-1) return Sfalse;
-    if ((tx2 = mktime(&tmx2)) == (time_t)-1) return Sfalse;
+    (void) adjust_time_zone(dtvec, &tmx, Sfalse);
-    INITVECTIT(dtvec, dtvec_tzoff) = S_integer_time_t(tx - tx2);
   } else {
     tx += Sinteger_value(tzoff);
     if (gmtime_r(&tx, &tmx) == NULL) return Sfalse;
     INITVECTIT(dtvec, dtvec_tzoff) = tzoff;
+    INITVECTIT(dtvec, dtvec_isdst) = Sfalse;
+    INITVECTIT(dtvec, dtvec_tzname) = Sfalse;
   }
 
   INITVECTIT(dtvec, dtvec_sec) = Sinteger(tmx.tm_sec);
@@ -346,7 +348,6 @@ ptr S_gmtime(ptr tzoff, ptr tspair) {
   INITVECTIT(dtvec, dtvec_year) = Sinteger(tmx.tm_year);
   INITVECTIT(dtvec, dtvec_wday) = Sinteger(tmx.tm_wday);
   INITVECTIT(dtvec, dtvec_yday) = Sinteger(tmx.tm_yday);
-  INITVECTIT(dtvec, dtvec_isdst) = Sinteger(tmx.tm_isdst);
 
   return dtvec;
 }
@@ -367,7 +368,7 @@ ptr S_asctime(ptr dtvec) {
     tmx.tm_year = (int)Sinteger_value(Svector_ref(dtvec, dtvec_year));
     tmx.tm_wday = (int)Sinteger_value(Svector_ref(dtvec, dtvec_wday));
     tmx.tm_yday = (int)Sinteger_value(Svector_ref(dtvec, dtvec_yday));
-    tmx.tm_isdst = (int)Sinteger_value(Svector_ref(dtvec, dtvec_isdst));
+    tmx.tm_isdst = (int)Sboolean_value(Svector_ref(dtvec, dtvec_isdst));
     if (asctime_r(&tmx, buf) == NULL) return Sfalse;
   }
 
@@ -377,7 +378,8 @@ ptr S_asctime(ptr dtvec) {
 ptr S_mktime(ptr dtvec) {
   time_t tx;
   struct tm tmx;
-  long orig_tzoff = (long)UNFIX(INITVECTIT(dtvec, dtvec_tzoff));
+  long orig_tzoff, tzoff;
+  ptr given_tzoff;
 
   tmx.tm_sec = (int)Sinteger_value(Svector_ref(dtvec, dtvec_sec));
   tmx.tm_min = (int)Sinteger_value(Svector_ref(dtvec, dtvec_min));
@@ -386,18 +388,14 @@ ptr S_mktime(ptr dtvec) {
   tmx.tm_mon = (int)Sinteger_value(Svector_ref(dtvec, dtvec_mon)) - 1;
   tmx.tm_year = (int)Sinteger_value(Svector_ref(dtvec, dtvec_year));
 
-  tmx.tm_isdst = 0;
+  given_tzoff = INITVECTIT(dtvec, dtvec_tzoff);
+  if (given_tzoff == Sfalse)
+    orig_tzoff = 0;
+  else
+    orig_tzoff = (long)UNFIX(given_tzoff);
+  
+  tmx.tm_isdst = -1; /* have mktime determine the DST status */
   if ((tx = mktime(&tmx)) == (time_t)-1) return Sfalse;
-  if (tmx.tm_isdst == 1) { /* guessed wrong */
-    tmx.tm_sec = (int)Sinteger_value(Svector_ref(dtvec, dtvec_sec));
-    tmx.tm_min = (int)Sinteger_value(Svector_ref(dtvec, dtvec_min));
-    tmx.tm_hour = (int)Sinteger_value(Svector_ref(dtvec, dtvec_hour));
-    tmx.tm_mday = (int)Sinteger_value(Svector_ref(dtvec, dtvec_mday));
-    tmx.tm_mon = (int)Sinteger_value(Svector_ref(dtvec, dtvec_mon)) - 1;
-    tmx.tm_year = (int)Sinteger_value(Svector_ref(dtvec, dtvec_year));
-    tmx.tm_isdst = 1;
-    if ((tx = mktime(&tmx)) == (time_t)-1) return Sfalse;
-  }
 
  /* mktime may have normalized some values, set wday and yday */
   INITVECTIT(dtvec, dtvec_sec) = Sinteger(tmx.tm_sec);
@@ -408,29 +406,66 @@ ptr S_mktime(ptr dtvec) {
   INITVECTIT(dtvec, dtvec_year) = Sinteger(tmx.tm_year);
   INITVECTIT(dtvec, dtvec_wday) = Sinteger(tmx.tm_wday);
   INITVECTIT(dtvec, dtvec_yday) = Sinteger(tmx.tm_yday);
-#ifdef WIN32
-  {
-    TIME_ZONE_INFORMATION tz;
-    DWORD rc = GetTimeZoneInformation(&tz);
-    long tzoff;
 
-    switch (rc) {
+  tzoff = adjust_time_zone(dtvec, &tmx, given_tzoff);
-      case TIME_ZONE_ID_UNKNOWN:
+
-      case TIME_ZONE_ID_STANDARD:
+  if (tzoff != orig_tzoff) tx = (time_t) difftime(tx, (time_t)(orig_tzoff - tzoff));
-        tzoff = tz.Bias * -60;
+
-        break;
-      case TIME_ZONE_ID_DAYLIGHT:
-        tzoff = (tz.Bias + tz.DaylightBias) * -60;
-        break;
-    }
-    if (tzoff != orig_tzoff) tx = (time_t) difftime(tx, (time_t)(orig_tzoff - tzoff));
-  }
-#else
-  if (tmx.tm_gmtoff != orig_tzoff) tx = difftime(tx, (time_t)(orig_tzoff - tmx.tm_gmtoff));
-#endif
   return Scons(S_integer_time_t(tx), Svector_ref(dtvec, dtvec_nsec));
 }
 
+static long adjust_time_zone(ptr dtvec, struct tm *tmxp, ptr given_tzoff) {
+  ptr tz_name = Sfalse;
+  long use_tzoff, tzoff;
+
+#ifdef WIN32
+  {
+    TIME_ZONE_INFORMATION tz;
+    WCHAR *w_tzname;
+    int len;
+
+    /* The ...ForYear() function is available on Windows Vista and later: */
+    GetTimeZoneInformationForYear(tmxp->tm_year, NULL, &tz);
+    
+    if (tmxp->tm_isdst) {
+      tzoff = (tz.Bias + tz.DaylightBias) * -60;
+      w_tzname = tz.DaylightName;
+    } else {
+      tzoff = (tz.Bias + tz.StandardBias) * -60;
+      w_tzname = tz.StandardName;
+    }
+
+    if (given_tzoff == Sfalse) {
+      len = (int)wcslen(w_tzname);
+      tz_name = S_string(NULL, len);
+      while (len--)
+        Sstring_set(tz_name, len, w_tzname[len]);
+    }
+  }
+#else
+  tzoff = tmxp->tm_gmtoff;
+  if (given_tzoff == Sfalse) {
+# if defined(__linux__) || defined(SOLARIS)
+    /* Linux and Solaris set `tzname`: */
+    tz_name = S_string(tzname[tmxp->tm_isdst], -1);
+# else
+    /* BSD variants add `tm_zone` in `struct tm`: */
+    tz_name = S_string(tmxp->tm_zone, -1);
+# endif
+  }
+#endif
+
+  if (given_tzoff == Sfalse)
+    use_tzoff = tzoff;
+  else
+    use_tzoff = (long)UNFIX(given_tzoff);
+
+  INITVECTIT(dtvec, dtvec_isdst) = ((given_tzoff == Sfalse) ? Sboolean(tmxp->tm_isdst) : Sfalse);
+  INITVECTIT(dtvec, dtvec_tzoff) = FIX(use_tzoff);
+  INITVECTIT(dtvec, dtvec_tzname) = tz_name;
+
+  return tzoff;
+}
 
 /********  old real-time and cpu-time support  ********/
 

csug/system.stex

@@ -3984,15 +3984,25 @@ It must be an exact integer in the range $-86400$ to
 $+86400$, inclusive and defaults to the local time-zone offset.
 UTC may be obtained by passing an offset of zero.
 
+If \var{offset} is not provided, then the current time zone's offset
+is used, and \scheme{date-dst?} and \scheme{date-zone-name} report
+information about the time zone. If \var{offset} is provided, then
+\scheme{date-dst?} and \scheme{date-zone-name} on the resulting date
+object produce \scheme{#f}.
+
 The following examples assume the local time zone is EST.
 
 \schemedisplay
 (current-date) ;=> #<date Thu Dec 27 23:23:20 2007>
 (current-date 0) ;=> #<date Fri Dec 28 04:23:20 2007>
+
+(date-zone-name (current-date)) ;=> "EST" \var{or other system-provided string}
+(date-zone-name (current-date 0)) ;=> #f
 \endschemedisplay
 
 %----------------------------------------------------------------------------
 \entryheader
+\formdef{make-date}{\categoryprocedure}{(make-date \var{nsec} \var{sec} \var{min} \var{hour} \var{day} \var{mon} \var{year})}
 \formdef{make-date}{\categoryprocedure}{(make-date \var{nsec} \var{sec} \var{min} \var{hour} \var{day} \var{mon} \var{year} \var{offset})}
 \returns a date object
 \listlibraries
@@ -4015,9 +4025,18 @@ as described above.
 It must be an exact integer in the range $-86400$ to $+86400$, inclusive.
 UTC may be specified by passing an offset of zero.
 
+If \var{offset} is not provided, then the current time zone's offset
+is used, and \scheme{date-dst?} and \scheme{date-zone-name} report
+information about the time zone. If \var{offset} is provided, then
+\scheme{date-dst?} and \scheme{date-zone-name} on the resulting date
+object produce \scheme{#f}.
+
 \schemedisplay
 (make-date 0 0 0 0 1 1 1970 0) ;=> #<date Thu Jan  1 00:00:00 1970>
 (make-date 0 30 7 9 23 9 2007 -14400) ;=> #<date Sun Sep 23 09:07:30 2007>
+
+(date-zone-name (make-date 0 30 7 9 23 9 2007 -14400)) ;=> #f
+(date-zone-name (make-date 0 30 7 9 23 9 2007)) ;=> "EDT" \var{or other system-provided string}
 \endschemedisplay
 
 %----------------------------------------------------------------------------
@@ -4097,6 +4116,32 @@ d2 ;=> #<date Sun Sep 23 09:07:30 2007>
 (date-year-day d2) ;=> 265
 \endschemedisplay
 
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{date-dst?}{\categoryprocedure}{(date-dst? \var{date})}
+\returns whether \var{date} is in Daylight Saving Time
+\formdef{date-zone-name}{\categoryprocedure}{(date-zone-name \var{date})}
+\returns \scheme{#f} or a string naming the time zone of \var{date}
+\listlibraries
+\endentryheader
+
+These procedures report time-zone information for
+the date represented by \var{date} for a date object that
+is constructed without an explicit time-zone offset. When
+a date object is created instead with explicit time-zone offset,
+these procedures produce \scheme{#f}.
+
+Daylight Saving Time status for the current time zone and a name
+string for the time zone are computed using platform-specific routines.
+In particular, the format of the zone name is platform-specific.
+
+\schemedisplay
+(define d (make-date 0 30 7 9 23 9 2007))
+(date-zone-offset d) ;=> -14400 \var{assuming Eastern U.S. time zone}
+(date-dst? d) ;=> #t
+(date-zone-name d) ;=> "EDT" \var{or some system-provided string}
+\endschemedisplay
+
 %----------------------------------------------------------------------------
 \entryheader
 \formdef{time-utc->date}{\categoryprocedure}{(time-utc->date \var{time})}
@@ -4119,6 +4164,12 @@ It must be an exact integer in the range $-86400$ to
 $+86400$, inclusive and defaults to the local time-zone offset.
 UTC may be obtained by passing an offset of zero.
 
+If \var{offset} is not provided to \scheme{time-utc->date}, then the current time zone's offset
+is used, and \scheme{date-dst?} and \scheme{date-zone-name} report
+information about the time zone. If \var{offset} is provided, then
+\scheme{date-dst?} and \scheme{date-zone-name} on the resulting date
+object produce \scheme{#f}.
+
 \schemedisplay
 (define d (make-date 0 30 7 9 23 9 2007 -14400))
 (date->time-utc d) ;=> #<time-utc 1190552850.000000000>

mats/date.ms

@@ -323,8 +323,6 @@
     (make-date 0 0 0 0 1))
   (error? ; wrong number of arguments
     (make-date 0 0 0 0 1 1))
-  (error? ; wrong number of arguments
-    (make-date 0 0 0 0 1 1 2007))
   (error? ; wrong number of arguments
     (make-date 0 0 0 0 1 1 2007 0 0))
   (error? ; invalid nanosecond
@@ -464,6 +462,14 @@
     (date-year-day 17))
   (error? ; not a date record
     (date-year-day $time-t1))
+  (error? ; wrong number of arguments
+    (date-dst?))
+  (error? ; wrong number of arguments
+    (date-dst? $date-d1 #t))
+  (error? ; not a date record
+    (date-dst? 17))
+  (error? ; not a date record
+    (date-dst? $time-t1))
   (error? ; wrong number of arguments
     (date-zone-offset))
   (error? ; wrong number of arguments
@@ -472,6 +478,14 @@
     (date-zone-offset 17))
   (error? ; not a date record
     (date-zone-offset $time-t1))
+  (error? ; wrong number of arguments
+    (date-zone-name))
+  (error? ; wrong number of arguments
+    (date-zone-name $date-d1 #t))
+  (error? ; not a date record
+    (date-zone-name 17))
+  (error? ; not a date record
+    (date-zone-name $time-t1))
   (error?  ; wrong number of arguments
     (current-date 0 #t))
   (error?  ; invalid offset
@@ -486,7 +500,10 @@
     (and (date? $date-d3) (not (time? $date-d3))))
   (begin
     (define $date-d4 (current-date (* 10 60 60)))
-    (and (date? $date-d4) (not (time? $date-d3))))
+    (and (date? $date-d4) (not (time? $date-d4))))
+  (begin
+    (define $date-d5 (make-date 0 1 1 1 15 6 2016))
+    (and (date? $date-d5) (not (time? $date-d5))))
   (date? (make-date 0 0 0 0 1 1 1970 -24))
   (date? (make-date 999999999 59 59 23 31 12 2007 24))
   (eqv? (date-nanosecond $date-d1) 1)
@@ -497,6 +514,54 @@
   (eqv? (date-month $date-d1) 6)
   (eqv? (date-year $date-d1) 1970)
   (eqv? (date-zone-offset $date-d1) 8)
+  (boolean? (date-dst? $date-d5))
+  (fixnum? (date-zone-offset $date-d5))
+  (eqv? (date-zone-name $date-d1) #f)
+  (or (string? (date-zone-name $date-d2))
+      (not (date-zone-name $date-d2)))
+  (eqv? (date-zone-name $date-d3) #f)
+  (eqv? (date-zone-name $date-d4) #f)
+  (or (string? (date-zone-name $date-d5))
+      (not (date-zone-name $date-d5)))
+  (begin
+    (define (plausible-dst? d)
+      ;; Recognize a few time zone names and correlate with the DST field.
+      ;; Names like "EST" appear on Unix variants, while the long names
+      ;; show up on Windows.
+      (cond
+       [(member (date-zone-name d) '("EST" "CST" "MST" "PST"
+				     "Eastern Standard Time"
+				     "Central Standard Time"
+				     "Mountain Standard Time"
+				     "Pacific Standard Time"))
+        (eqv? (date-dst? d) #f)]
+       [(member (date-zone-name d) '("EDT" "CDT" "MDT" "PDT"
+				     "Eastern Daylight Time"
+				     "Central Daylight Time"
+				     "Mountain Daylight Time"
+				     "Pacific Daylight Time"))
+        (eqv? (date-dst? d) #t)]
+       [else #t]))
+    (plausible-dst? $date-d5))
+  (begin
+    (define $date-d6 (make-date 0 1 1 1 15 1 2016))
+    (plausible-dst? $date-d6))
+ ; check whether tz offsets are set according to DST, assuming that
+ ; DST always means a 1-hour shift
+  (let ([delta (time-second (time-difference (date->time-utc $date-d5)
+                                             (date->time-utc $date-d6)))]
+        [no-dst-delta (* 152 24 60 60)]; 152 days
+        [hour-delta (* 60 60)])
+    (cond
+     [(and (date-dst? $date-d5) (not (date-dst? $date-d6)))
+      ;; Northern-hemisphere DST reduces delta
+      (= delta (- no-dst-delta hour-delta))]
+     [(and (not (date-dst? $date-d5)) (date-dst? $date-d6))
+      ;; Southern-hemisphere DST increases delta
+      (= delta (+ no-dst-delta hour-delta))]
+     [else
+      ;; No DST or always DST
+      (= delta no-dst-delta)]))
  ; check to make sure dst isn't screwing with our explicitly created dates
  ; when we call mktime to fill in wday and yday
   (let f ([mon 1])

mats/misc.ms

@@ -604,6 +604,12 @@
                   17)))])
         (cons v ls)))
     '(3 17 17))
+  ; regression test for bug in which $flonum-exponent read past mapped memory
+  (eq?
+    (do ([n 2000 (- n 1)] [ls (iota 2000)])
+        ((= n 0) 'fini)
+      (map (lambda (x) (let ([x (exact (sqrt -2.0))]) x)) ls))
+    'fini)
 )
 
 (mat compiler3

mats/patch-compile-0-f-f-t

@@ -1,47 +1,5 @@
-*** errors-compile-0-f-f-f	2017-05-28 20:37:09.000000000 -0400
+*** errors-compile-0-f-f-f	2017-06-06 15:52:54.089820649 -0400
---- errors-compile-0-f-f-t	2017-05-28 20:47:43.000000000 -0400
+--- errors-compile-0-f-f-t	2017-06-06 15:55:15.167428881 -0400
-***************
-*** 3603,3609 ****
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
-! misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation 5".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation oldgen".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
-  misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
---- 3603,3609 ----
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
-! misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation 7".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation oldgen".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
-  misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
-***************
-*** 7085,7095 ****
-  7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation <int>".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation #f".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
---- 7085,7095 ----
-  7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 7".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation <int>".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation #f".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 7".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 7".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
 ***************
 *** 8461,8473 ****
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".

mats/patch-compile-0-f-t-t

@@ -0,0 +1,31 @@
+*** errors-compile-0-f-t-f	2017-06-06 15:57:35.377030441 -0400
+--- errors-compile-0-f-t-t	2017-06-06 15:59:53.402609438 -0400
+***************
+*** 8461,8473 ****
+  fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
+! fx.mo:Expected error in mat fx*: "fx*: fixnum overflow with arguments <int> and 2".
+  fx.mo:Expected error in mat fx*: "fx*: <int> is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: <-int> is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: #f is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: #f is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: (a . b) is not a fixnum".
+! fx.mo:Expected error in mat r6rs:fx*: "fx*: fixnum overflow with arguments <int> and 2".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
+--- 8461,8473 ----
+  fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
+! fx.mo:Expected error in mat fx*: "fx*: fixnum overflow computing (fx* <int> 2)".
+  fx.mo:Expected error in mat fx*: "fx*: <int> is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: <-int> is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: #f is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: #f is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: (a . b) is not a fixnum".
+! fx.mo:Expected error in mat r6rs:fx*: "fx*: fixnum overflow computing (fx* <int> 2)".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".

mats/patch-compile-0-t-f-f

@@ -5932,7 +5932,7 @@
   date.mo:Expected error in mat time: "time>=?: #<procedure car> is not a time record".
   date.mo:Expected error in mat time: "time>=?: types of <time> and <time> differ".
 ***************
-*** 9843,9857 ****
+*** 9843,9856 ****
   date.mo:Expected error in mat time: "add-duration: <time> does not have type time-duration".
   date.mo:Expected error in mat time: "subtract-duration: <time> does not have type time-duration".
   date.mo:Expected error in mat time: "copy-time: <date> is not a time record".
@@ -5943,12 +5943,11 @@
 ! date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0)".
 ! date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1)".
 ! date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1 ...)".
-! date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1 ...)".
 ! date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1 ...)".
   date.mo:Expected error in mat date: "make-date: invalid nanosecond -1".
   date.mo:Expected error in mat date: "make-date: invalid nanosecond <int>".
   date.mo:Expected error in mat date: "make-date: invalid nanosecond zero".
---- 9843,9857 ----
+--- 9843,9856 ----
   date.mo:Expected error in mat time: "add-duration: <time> does not have type time-duration".
   date.mo:Expected error in mat time: "subtract-duration: <time> does not have type time-duration".
   date.mo:Expected error in mat time: "copy-time: <date> is not a time record".
@@ -5959,13 +5958,12 @@
 ! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure make-date>".
 ! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure make-date>".
 ! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure make-date>".
-! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure make-date>".
 ! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure make-date>".
   date.mo:Expected error in mat date: "make-date: invalid nanosecond -1".
   date.mo:Expected error in mat date: "make-date: invalid nanosecond <int>".
   date.mo:Expected error in mat date: "make-date: invalid nanosecond zero".
 ***************
-*** 9877,9929 ****
+*** 9876,9936 ****
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset 90000".
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset est".
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset "est"".
@@ -6011,15 +6009,23 @@
 ! date.mo:Expected error in mat date: "incorrect argument count in call (date-year-day $date-d1 #t)".
   date.mo:Expected error in mat date: "date-year-day: 17 is not a date record".
   date.mo:Expected error in mat date: "date-year-day: <time> is not a date record".
+! date.mo:Expected error in mat date: "incorrect argument count in call (date-dst?)".
+! date.mo:Expected error in mat date: "incorrect argument count in call (date-dst? $date-d1 #t)".
+  date.mo:Expected error in mat date: "date-dst?: 17 is not a date record".
+  date.mo:Expected error in mat date: "date-dst?: <time> is not a date record".
 ! date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-offset)".
 ! date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-offset $date-d1 #t)".
   date.mo:Expected error in mat date: "date-zone-offset: 17 is not a date record".
   date.mo:Expected error in mat date: "date-zone-offset: <time> is not a date record".
+! date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-name)".
+! date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-name $date-d1 #t)".
+  date.mo:Expected error in mat date: "date-zone-name: 17 is not a date record".
+  date.mo:Expected error in mat date: "date-zone-name: <time> is not a date record".
 ! date.mo:Expected error in mat date: "incorrect argument count in call (current-date 0 #t)".
   date.mo:Expected error in mat date: "current-date: invalid time-zone offset -90000".
   date.mo:Expected error in mat date: "current-date: invalid time-zone offset 90000".
   date.mo:Expected error in mat conversions/sleep: "date->time-utc: <time> is not a date record".
---- 9877,9929 ----
+--- 9876,9936 ----
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset 90000".
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset est".
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset "est"".
@@ -6065,10 +6071,18 @@
 ! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure date-year-day>".
   date.mo:Expected error in mat date: "date-year-day: 17 is not a date record".
   date.mo:Expected error in mat date: "date-year-day: <time> is not a date record".
+! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure date-dst?>".
+! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure date-dst?>".
+  date.mo:Expected error in mat date: "date-dst?: 17 is not a date record".
+  date.mo:Expected error in mat date: "date-dst?: <time> is not a date record".
 ! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure date-zone-offset>".
 ! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure date-zone-offset>".
   date.mo:Expected error in mat date: "date-zone-offset: 17 is not a date record".
   date.mo:Expected error in mat date: "date-zone-offset: <time> is not a date record".
+! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure date-zone-name>".
+! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure date-zone-name>".
+  date.mo:Expected error in mat date: "date-zone-name: 17 is not a date record".
+  date.mo:Expected error in mat date: "date-zone-name: <time> is not a date record".
 ! date.mo:Expected error in mat date: "incorrect number of arguments to #<procedure current-date>".
   date.mo:Expected error in mat date: "current-date: invalid time-zone offset -90000".
   date.mo:Expected error in mat date: "current-date: invalid time-zone offset 90000".

mats/patch-compile-0-t-f-t

@@ -1,44 +0,0 @@
-*** errors-compile-0-t-f-f	2017-05-28 20:58:24.000000000 -0400
---- errors-compile-0-t-f-t	2017-05-28 20:41:04.000000000 -0400
-***************
-*** 3603,3609 ****
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
-! misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation 5".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation oldgen".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
-  misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
---- 3603,3609 ----
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
-! misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation 2".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation oldgen".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
-  misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
-***************
-*** 7085,7095 ****
-  7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation <int>".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation #f".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
---- 7085,7095 ----
-  7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 2".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation <int>".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation #f".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 2".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 2".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".

mats/patch-compile-0-t-t-f

@@ -1,5 +1,5 @@
-*** errors-compile-0-t-f-f	2017-05-28 20:58:24.000000000 -0400
+*** errors-compile-0-t-f-f	2017-06-06 16:02:22.028311707 -0400
---- errors-compile-0-t-t-f	2017-05-28 20:52:16.000000000 -0400
+--- errors-compile-0-t-t-f	2017-06-06 16:07:14.499665698 -0400
 ***************
 *** 144,150 ****
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable b".

mats/patch-compile-2-f-f-t

@@ -1,49 +1,7 @@
-*** errors-compile-2-f-f-f	2015-07-29 12:19:23.903063770 -0400
+*** errors-compile-2-f-f-f	2017-06-06 16:12:00.046943669 -0400
---- errors-compile-2-f-f-t	2015-07-29 12:24:31.581777295 -0400
+--- errors-compile-2-f-f-t	2017-06-06 16:14:20.812560365 -0400
 ***************
-*** 3518,3524 ****
+*** 8461,8473 ****
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
-! misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation 5".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation oldgen".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
-  misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
---- 3518,3524 ----
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
-! misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation 7".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation oldgen".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
-  misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
-***************
-*** 6949,6959 ****
-  7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation <int>".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation #f".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
---- 6949,6959 ----
-  7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 7".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation <int>".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation #f".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 7".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 7".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-***************
-*** 8299,8311 ****
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -57,7 +15,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
---- 8299,8311 ----
+--- 8461,8473 ----
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".

mats/patch-compile-2-f-t-f

@@ -1,5 +1,5 @@
-*** errors-compile-2-f-f-f	2015-08-17 17:23:24.150166605 -0400
+*** errors-compile-2-f-f-f	2017-06-06 16:12:00.046943669 -0400
---- errors-compile-2-f-t-f	2015-08-17 17:25:45.067806542 -0400
+--- errors-compile-2-f-t-f	2017-06-06 16:16:41.718216927 -0400
 ***************
 *** 125,131 ****
   3.mo:Expected error in mat dipa-letrec: "attempt to reference undefined variable a".
@@ -58,7 +58,7 @@
   3.mo:Expected error in mat mrvs: "attempt to apply non-procedure 17".
   3.mo:Expected error in mat mrvs: "returned two values to single value return context".
 ***************
-*** 3560,3566 ****
+*** 3645,3651 ****
   misc.mo:Expected error in mat cpletrec: "foreign-procedure: no entry for "foo"".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable q".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable bar".
@@ -66,7 +66,7 @@
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable a".
---- 3560,3566 ----
+--- 3645,3651 ----
   misc.mo:Expected error in mat cpletrec: "foreign-procedure: no entry for "foo"".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable q".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable bar".
@@ -75,7 +75,7 @@
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable a".
 ***************
-*** 6979,6986 ****
+*** 7095,7102 ****
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -84,7 +84,7 @@
   record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
---- 6979,6986 ----
+--- 7095,7102 ----
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -94,7 +94,7 @@
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
 ***************
-*** 6988,7002 ****
+*** 7104,7118 ****
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -110,7 +110,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid input #f".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
---- 6988,7002 ----
+--- 7104,7118 ----
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -127,7 +127,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
 ***************
-*** 7009,7034 ****
+*** 7125,7150 ****
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -154,7 +154,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
---- 7009,7034 ----
+--- 7125,7150 ----
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -182,7 +182,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
 ***************
-*** 7140,7178 ****
+*** 7275,7313 ****
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -222,7 +222,7 @@
   record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
---- 7140,7178 ----
+--- 7275,7313 ----
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -263,7 +263,7 @@
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
 ***************
-*** 7187,7243 ****
+*** 7322,7378 ****
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
@@ -321,7 +321,7 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
   record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
   record.mo:Expected error in mat r6rs-records-syntactic: "cannot extend define-record-type parent fratrat".
---- 7187,7243 ----
+--- 7322,7378 ----
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".

mats/patch-compile-2-f-t-t

@@ -0,0 +1,31 @@
+*** errors-compile-2-f-t-f	2017-06-06 16:16:41.718216927 -0400
+--- errors-compile-2-f-t-t	2017-06-06 16:19:00.107991971 -0400
+***************
+*** 8461,8473 ****
+  fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
+! fx.mo:Expected error in mat fx*: "fx*: fixnum overflow with arguments <int> and 2".
+  fx.mo:Expected error in mat fx*: "fx*: <int> is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: <-int> is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: #f is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: #f is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: (a . b) is not a fixnum".
+! fx.mo:Expected error in mat r6rs:fx*: "fx*: fixnum overflow with arguments <int> and 2".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
+--- 8461,8473 ----
+  fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
+! fx.mo:Expected error in mat fx*: "fx*: fixnum overflow computing (fx* <int> 2)".
+  fx.mo:Expected error in mat fx*: "fx*: <int> is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: <-int> is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: #f is not a fixnum".
+  fx.mo:Expected error in mat fx*: "fx*: #f is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: (a . b) is not a fixnum".
+! fx.mo:Expected error in mat r6rs:fx*: "fx*: fixnum overflow computing (fx* <int> 2)".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
+  fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".

mats/patch-compile-2-t-f-t

@@ -1,44 +0,0 @@
-*** errors-compile-2-t-f-f	2015-07-29 15:53:29.390864194 -0400
---- errors-compile-2-t-f-t	2015-07-29 12:22:00.035963126 -0400
-***************
-*** 3518,3524 ****
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
-! misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation 5".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation oldgen".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
-  misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
---- 3518,3524 ----
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
-  misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
-! misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation 2".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation oldgen".
-  misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
-  misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
-***************
-*** 6949,6959 ****
-  7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation <int>".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation #f".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 5".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
---- 6949,6959 ----
-  7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 2".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation <int>".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation #f".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 2".
-! 7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation 2".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
-  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".

mats/patch-compile-2-t-t-f

@@ -1,5 +1,5 @@
-*** errors-compile-2-t-f-f	2015-08-17 17:28:13.186583404 -0400
+*** errors-compile-2-t-f-f	2017-06-06 16:21:29.501865805 -0400
---- errors-compile-2-t-t-f	2015-08-17 17:30:46.708455680 -0400
+--- errors-compile-2-t-t-f	2017-06-06 16:26:19.869420768 -0400
 ***************
 *** 144,150 ****
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable b".
@@ -18,7 +18,7 @@
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable c".
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x".
 ***************
-*** 3560,3566 ****
+*** 3645,3651 ****
   misc.mo:Expected error in mat cpletrec: "foreign-procedure: no entry for "foo"".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable q".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable bar".
@@ -26,7 +26,7 @@
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable a".
---- 3560,3566 ----
+--- 3645,3651 ----
   misc.mo:Expected error in mat cpletrec: "foreign-procedure: no entry for "foo"".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable q".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable bar".
@@ -35,7 +35,7 @@
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable a".
 ***************
-*** 6979,6986 ****
+*** 7095,7102 ****
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -44,7 +44,7 @@
   record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
---- 6979,6986 ----
+--- 7095,7102 ----
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -54,7 +54,7 @@
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
 ***************
-*** 6988,7002 ****
+*** 7104,7118 ****
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -70,7 +70,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid input #f".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
---- 6988,7002 ----
+--- 7104,7118 ----
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -87,7 +87,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
 ***************
-*** 7009,7034 ****
+*** 7125,7150 ****
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -114,7 +114,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
---- 7009,7034 ----
+--- 7125,7150 ----
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -142,7 +142,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
 ***************
-*** 7140,7178 ****
+*** 7275,7313 ****
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -182,7 +182,7 @@
   record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
---- 7140,7178 ----
+--- 7275,7313 ----
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -223,7 +223,7 @@
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
 ***************
-*** 7198,7233 ****
+*** 7333,7368 ****
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-type-descriptor: cannot extend sealed record type #<record type bar>".
   record.mo:Expected error in mat r6rs-records-syntactic: "invalid syntax point".
@@ -260,7 +260,7 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
   record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
   record.mo:Expected error in mat r6rs-records-syntactic: "parent record type is sealed ex3".
---- 7198,7233 ----
+--- 7333,7368 ----
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-type-descriptor: cannot extend sealed record type #<record type bar>".
   record.mo:Expected error in mat r6rs-records-syntactic: "invalid syntax point".

mats/patch-interpret-0-f-f-f

@@ -526,7 +526,7 @@
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
 ***************
-*** 9932,9941 ****
+*** 9939,9948 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -537,7 +537,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 9932,9941 ----
+--- 9939,9948 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".

mats/patch-interpret-0-f-t-f

@@ -539,7 +539,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
 ***************
-*** 9932,9941 ****
+*** 9939,9948 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -550,7 +550,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 9932,9941 ----
+--- 9939,9948 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".

mats/patch-interpret-0-t-f-f

@@ -1,5 +1,5 @@
-*** errors-compile-0-t-f-f	2017-05-28 20:58:24.000000000 -0400
+*** errors-compile-0-t-f-f	2017-06-06 16:02:22.028311707 -0400
---- errors-interpret-0-t-f-f	2017-05-28 22:10:11.000000000 -0400
+--- errors-interpret-0-t-f-f	2017-06-06 17:00:22.766486846 -0400
 ***************
 *** 1,7 ****
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
@@ -470,7 +470,7 @@
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
 ***************
-*** 9932,9941 ****
+*** 9939,9948 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -481,7 +481,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 9932,9941 ----
+--- 9939,9948 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".

mats/patch-interpret-0-t-t-f

@@ -1,5 +1,5 @@
-*** errors-compile-0-t-t-f	2017-05-28 20:52:16.000000000 -0400
+*** errors-compile-0-t-t-f	2017-06-06 16:07:14.499665698 -0400
---- errors-interpret-0-t-t-f	2017-05-28 22:15:43.000000000 -0400
+--- errors-interpret-0-t-t-f	2017-06-06 17:05:55.514674822 -0400
 ***************
 *** 1,7 ****
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
@@ -468,7 +468,7 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
   record.mo:Expected error in mat r6rs-records-syntactic: "parent record type is sealed ex3".
 ***************
-*** 9932,9941 ****
+*** 9939,9948 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -479,7 +479,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 9932,9941 ----
+--- 9939,9948 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".

mats/patch-interpret-2-f-f-f

@@ -1,5 +1,5 @@
-*** errors-compile-2-f-f-f	2015-07-29 12:19:23.903063770 -0400
+*** errors-compile-2-f-f-f	2017-06-06 16:12:00.046943669 -0400
---- errors-interpret-2-f-f-f	2015-07-29 12:36:02.928570160 -0400
+--- errors-interpret-2-f-f-f	2017-06-06 17:11:16.982644072 -0400
 ***************
 *** 1,7 ****
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
@@ -10,12 +10,12 @@
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: -1 is not a positive fixnum".
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: 0 is not a positive fixnum".
 --- 1,13 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 995, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1005, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 997, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1007, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1004, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1014, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1006, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1016, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1013, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1023, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1015, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1025, char 4 of 6.ms
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
   primvars.mo:Expected error in mat make-parameter: "+: a is not a number".
   primvars.mo:Expected error in mat make-parameter: "incorrect number of arguments to #<procedure>".
@@ -196,7 +196,7 @@
   3.mo:Expected error in mat mrvs: "returned two values to single value return context".
   3.mo:Expected error in mat mrvs: "cdr: a is not a pair".
 ***************
-*** 3894,3909 ****
+*** 4004,4019 ****
   6.mo:Expected error in mat pretty-print: "incorrect argument count in call (pretty-format (quote foo) (quote x) (quote x))".
   6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
   6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
@@ -213,9 +213,26 @@
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected error in mat print-parameters: "write: cycle detected; proceeding with (print-graph #t)".
---- 3900,3909 ----
+--- 4010,4019 ----
 ***************
-*** 7131,7137 ****
+*** 6959,6965 ****
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+! 7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
+--- 6959,6965 ----
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+! 7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
+***************
+*** 7286,7292 ****
   record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
   record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
   record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
@@ -223,7 +240,7 @@
   record.mo:Expected error in mat record25: "invalid value 12.0 for foreign type long-long".
   record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
   record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
---- 7131,7137 ----
+--- 7286,7292 ----
   record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
   record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
   record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
@@ -232,7 +249,7 @@
   record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
   record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
 ***************
-*** 8299,8311 ****
+*** 8461,8473 ****
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -246,7 +263,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
---- 8299,8311 ----
+--- 8461,8473 ----
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -261,7 +278,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
 ***************
-*** 9061,9085 ****
+*** 9224,9248 ****
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
@@ -287,7 +304,7 @@
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier booleen".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier integer-34".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure result type specifier chare".
---- 9061,9085 ----
+--- 9224,9248 ----
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
@@ -314,7 +331,7 @@
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier integer-34".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure result type specifier chare".
 ***************
-*** 9092,9123 ****
+*** 9255,9286 ****
   foreign.mo:Expected error in mat foreign-sizeof: "incorrect argument count in call (foreign-sizeof (quote int) (quote int))".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
@@ -347,7 +364,7 @@
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
---- 9092,9123 ----
+--- 9255,9286 ----
   foreign.mo:Expected error in mat foreign-sizeof: "incorrect argument count in call (foreign-sizeof (quote int) (quote int))".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
@@ -381,7 +398,7 @@
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
 ***************
-*** 9125,9150 ****
+*** 9288,9313 ****
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
@@ -408,7 +425,7 @@
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
---- 9125,9150 ----
+--- 9288,9313 ----
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
@@ -436,7 +453,7 @@
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
 ***************
-*** 9155,9189 ****
+*** 9318,9352 ****
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
@@ -472,7 +489,7 @@
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
---- 9155,9189 ----
+--- 9318,9352 ----
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
@@ -509,7 +526,7 @@
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
 ***************
-*** 9763,9772 ****
+*** 9939,9948 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -520,7 +537,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 9763,9772 ----
+--- 9939,9948 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".

mats/patch-interpret-2-f-t-f

@@ -1,5 +1,5 @@
-*** errors-compile-2-f-t-f	2015-07-29 15:53:29.372863858 -0400
+*** errors-compile-2-f-t-f	2017-06-06 16:16:41.718216927 -0400
---- errors-interpret-2-f-t-f	2015-07-29 12:38:56.709803754 -0400
+--- errors-interpret-2-f-t-f	2017-06-06 17:16:29.338462408 -0400
 ***************
 *** 1,7 ****
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
@@ -10,12 +10,12 @@
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: -1 is not a positive fixnum".
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: 0 is not a positive fixnum".
 --- 1,13 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 995, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1005, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 997, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1007, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1004, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1014, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1006, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1016, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1013, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1023, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1015, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1025, char 4 of 6.ms
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
   primvars.mo:Expected error in mat make-parameter: "+: a is not a number".
   primvars.mo:Expected error in mat make-parameter: "incorrect number of arguments to #<procedure>".
@@ -169,7 +169,7 @@
   3.mo:Expected error in mat letrec: "variable f is not bound".
   3.mo:Expected error in mat letrec: "attempt to reference undefined variable a".
 ***************
-*** 3894,3909 ****
+*** 4004,4019 ****
   6.mo:Expected error in mat pretty-print: "incorrect argument count in call (pretty-format (quote foo) (quote x) (quote x))".
   6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
   6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
@@ -186,9 +186,26 @@
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected error in mat print-parameters: "write: cycle detected; proceeding with (print-graph #t)".
---- 3900,3909 ----
+--- 4010,4019 ----
 ***************
-*** 6959,6966 ****
+*** 6959,6965 ****
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+! 7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
+--- 6959,6965 ----
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+! 7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
+***************
+*** 7095,7102 ****
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -197,7 +214,7 @@
   record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
---- 6959,6966 ----
+--- 7095,7102 ----
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -207,7 +224,7 @@
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
 ***************
-*** 6968,6982 ****
+*** 7104,7118 ****
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -223,7 +240,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid input #f".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
---- 6968,6982 ----
+--- 7104,7118 ----
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -240,7 +257,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
 ***************
-*** 6989,7014 ****
+*** 7125,7150 ****
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -267,7 +284,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
---- 6989,7014 ----
+--- 7125,7150 ----
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -295,7 +312,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
 ***************
-*** 7120,7158 ****
+*** 7275,7313 ****
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -335,7 +352,7 @@
   record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
---- 7120,7158 ----
+--- 7275,7313 ----
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -376,7 +393,7 @@
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
 ***************
-*** 7167,7223 ****
+*** 7322,7378 ****
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
@@ -434,16 +451,16 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
   record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
   record.mo:Expected error in mat r6rs-records-syntactic: "cannot extend define-record-type parent fratrat".
---- 7167,7223 ----
+--- 7322,7378 ----
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
 ! record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments to #<procedure constructor>".
 ! record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments to #<procedure constructor>".
-  record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments to #<procedure>".
-  record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments to #<procedure>".
 ! record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments to #<procedure>".
 ! record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments to #<procedure>".
+  record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments to #<procedure>".
+  record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments to #<procedure>".
 ! record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments to #<procedure constructor>".
 ! record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments to #<procedure constructor>".
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
@@ -493,7 +510,7 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
   record.mo:Expected error in mat r6rs-records-syntactic: "cannot extend define-record-type parent fratrat".
 ***************
-*** 8299,8311 ****
+*** 8461,8473 ****
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -507,7 +524,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
---- 8299,8311 ----
+--- 8461,8473 ----
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -522,7 +539,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
 ***************
-*** 9763,9772 ****
+*** 9939,9948 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -533,7 +550,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 9763,9772 ----
+--- 9939,9948 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".

mats/patch-interpret-2-t-f-f

@@ -1,5 +1,5 @@
-*** errors-compile-2-t-f-f	2015-07-29 15:53:29.390864194 -0400
+*** errors-compile-2-t-f-f	2017-06-06 16:21:29.501865805 -0400
---- errors-interpret-2-t-f-f	2015-07-29 15:46:20.048858635 -0400
+--- errors-interpret-2-t-f-f	2017-06-06 17:21:48.522343187 -0400
 ***************
 *** 1,7 ****
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
@@ -10,12 +10,12 @@
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: -1 is not a positive fixnum".
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: 0 is not a positive fixnum".
 --- 1,13 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 995, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1005, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 997, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1007, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1004, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1014, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1006, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1016, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1013, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1023, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1015, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1025, char 4 of 6.ms
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
   primvars.mo:Expected error in mat make-parameter: "+: a is not a number".
   primvars.mo:Expected error in mat make-parameter: "incorrect number of arguments to #<procedure>".
@@ -169,7 +169,7 @@
   3.mo:Expected error in mat letrec: "variable f is not bound".
   3.mo:Expected error in mat letrec: "attempt to reference undefined variable a".
 ***************
-*** 3894,3909 ****
+*** 4004,4019 ****
   6.mo:Expected error in mat pretty-print: "incorrect number of arguments to #<procedure pretty-format>".
   6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
   6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
@@ -186,9 +186,26 @@
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected error in mat print-parameters: "write: cycle detected; proceeding with (print-graph #t)".
---- 3900,3909 ----
+--- 4010,4019 ----
 ***************
-*** 7131,7137 ****
+*** 6959,6965 ****
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+! 7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
+--- 6959,6965 ----
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+! 7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
+***************
+*** 7286,7292 ****
   record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
   record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
   record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
@@ -196,7 +213,7 @@
   record.mo:Expected error in mat record25: "invalid value 12.0 for foreign type long-long".
   record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
   record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
---- 7131,7137 ----
+--- 7286,7292 ----
   record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
   record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
   record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
@@ -205,7 +222,7 @@
   record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
   record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
 ***************
-*** 9061,9085 ****
+*** 9224,9248 ****
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
@@ -231,7 +248,7 @@
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier booleen".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier integer-34".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure result type specifier chare".
---- 9061,9085 ----
+--- 9224,9248 ----
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
@@ -258,7 +275,7 @@
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier integer-34".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure result type specifier chare".
 ***************
-*** 9092,9123 ****
+*** 9255,9286 ****
   foreign.mo:Expected error in mat foreign-sizeof: "incorrect number of arguments to #<procedure foreign-sizeof>".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
@@ -291,7 +308,7 @@
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
---- 9092,9123 ----
+--- 9255,9286 ----
   foreign.mo:Expected error in mat foreign-sizeof: "incorrect number of arguments to #<procedure foreign-sizeof>".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
@@ -325,7 +342,7 @@
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
 ***************
-*** 9125,9150 ****
+*** 9288,9313 ****
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
@@ -352,7 +369,7 @@
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
---- 9125,9150 ----
+--- 9288,9313 ----
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
@@ -380,7 +397,7 @@
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
 ***************
-*** 9155,9189 ****
+*** 9318,9352 ****
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
@@ -416,7 +433,7 @@
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
---- 9155,9189 ----
+--- 9318,9352 ----
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
@@ -453,7 +470,7 @@
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
 ***************
-*** 9763,9772 ****
+*** 9939,9948 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -464,7 +481,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 9763,9772 ----
+--- 9939,9948 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".

mats/patch-interpret-2-t-t-f

@@ -0,0 +1,492 @@
+*** errors-compile-2-t-t-f	2017-06-06 16:26:19.869420768 -0400
+--- errors-interpret-2-t-t-f	2017-06-06 17:27:13.666434240 -0400
+***************
+*** 1,7 ****
+  primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
+  primvars.mo:Expected error in mat make-parameter: "+: a is not a number".
+  primvars.mo:Expected error in mat make-parameter: "incorrect number of arguments to #<procedure>".
+! primvars.mo:Expected error in mat parameterize: "incorrect number of arguments to #<procedure x>".
+  primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: a is not a positive fixnum".
+  primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: -1 is not a positive fixnum".
+  primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: 0 is not a positive fixnum".
+--- 1,13 ----
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1005, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1007, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1014, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1016, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1023, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1025, char 4 of 6.ms
+  primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
+  primvars.mo:Expected error in mat make-parameter: "+: a is not a number".
+  primvars.mo:Expected error in mat make-parameter: "incorrect number of arguments to #<procedure>".
+! primvars.mo:Expected error in mat parameterize: "incorrect number of arguments to #<procedure>".
+  primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: a is not a positive fixnum".
+  primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: -1 is not a positive fixnum".
+  primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: 0 is not a positive fixnum".
+***************
+*** 28,98 ****
+  primvars.mo:Expected error in mat print-radix: "print-radix: 1 is not between 2 and 36".
+  primvars.mo:Expected error in mat timer-interrupt-handler: "timer-interrupt-handler: midnight is not a procedure".
+  primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input port string> is not a textual output port".
+! 3.mo:Expected error in mat matrest1: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest2: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest2: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest3: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest3: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest3: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest4: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest4: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest4: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest4: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest5: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest5: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest5: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest5: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest5: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure matrestf>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure matrestf>".
+  3.mo:Expected error in mat application: "attempt to apply non-procedure ((a b c))".
+  3.mo:Expected error in mat case-lambda: "incorrect argument count in call ((case-lambda))".
+  3.mo:Expected error in mat case-lambda: "incorrect argument count in call (f 3 4 5)".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure foo>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure foo>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure foo>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure foo>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure foo>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure foo>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure foo>".
+  3.mo:Expected error in mat let: "incorrect argument count in call ((lambda (x . r) ((...) x (...))))".
+  3.mo:Expected error in mat letrec: "variable f is not bound".
+  3.mo:Expected error in mat letrec: "attempt to reference undefined variable a".
+--- 34,104 ----
+  primvars.mo:Expected error in mat print-radix: "print-radix: 1 is not between 2 and 36".
+  primvars.mo:Expected error in mat timer-interrupt-handler: "timer-interrupt-handler: midnight is not a procedure".
+  primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input port string> is not a textual output port".
+! 3.mo:Expected error in mat matrest1: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest2: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest2: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest3: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest3: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest3: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest4: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest4: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest4: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest4: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest5: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest5: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest5: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest5: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest5: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest6: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest7: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest8: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest9: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat matrest10: "incorrect number of arguments to #<procedure>".
+  3.mo:Expected error in mat application: "attempt to apply non-procedure ((a b c))".
+  3.mo:Expected error in mat case-lambda: "incorrect argument count in call ((case-lambda))".
+  3.mo:Expected error in mat case-lambda: "incorrect argument count in call (f 3 4 5)".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure>".
+! 3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure>".
+  3.mo:Expected error in mat let: "incorrect argument count in call ((lambda (x . r) ((...) x (...))))".
+  3.mo:Expected error in mat letrec: "variable f is not bound".
+  3.mo:Expected error in mat letrec: "attempt to reference undefined variable a".
+***************
+*** 4004,4019 ****
+  6.mo:Expected error in mat pretty-print: "incorrect number of arguments to #<procedure pretty-format>".
+  6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
+  6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
+- 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format".
+- 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~a~a~a~s" in call to format".
+  6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format at line 1, char 28 of testfile.ss".
+  6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~a~a~a~s" in call to format at line 1, char 28 of testfile.ss".
+- 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to printf".
+- 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to printf".
+  6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to printf at line 1, char 28 of testfile.ss".
+  6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to printf at line 1, char 28 of testfile.ss".
+- 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf".
+- 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf".
+  6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf at line 1, char 29 of testfile.ss".
+  6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf at line 1, char 29 of testfile.ss".
+  6.mo:Expected error in mat print-parameters: "write: cycle detected; proceeding with (print-graph #t)".
+--- 4010,4019 ----
+***************
+*** 6959,6965 ****
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+! 7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
+--- 6959,6965 ----
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
+  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+! 7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
+  7.mo:Expected error in mat eval: "compile: 7 is not an environment".
+  7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
+***************
+*** 7095,7102 ****
+  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
+  7.mo:Expected error in mat error: "a: hit me!".
+  7.mo:Expected error in mat error: "f: n is 0".
+! record.mo:Expected error in mat record1: "make-fudge: invalid value 3 for foreign type double-float".
+! record.mo:Expected error in mat record1: "fudge-a: 3 is not of type #<record type fudge>".
+  record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
+  record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
+  record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
+--- 7095,7102 ----
+  7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
+  7.mo:Expected error in mat error: "a: hit me!".
+  7.mo:Expected error in mat error: "f: n is 0".
+! record.mo:Expected error in mat record1: "invalid value 3 for foreign type double-float".
+! record.mo:Expected error in mat record1: "3 is not of type #<record type fudge>".
+  record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
+  record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
+  record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
+***************
+*** 7104,7118 ****
+  record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
+  record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
+  record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
+! record.mo:Expected error in mat record4: "set-fudge-a!: 3 is not of type #<record type fudge>".
+! record.mo:Expected error in mat record5: "set-fudge-b!: invalid value 4 for foreign type double-float".
+! record.mo:Expected error in mat record5: "set-fudge-b!: invalid value 4 for foreign type double-float".
+! record.mo:Expected error in mat record6: "make-bar: invalid value <int> for foreign type integer-32".
+! record.mo:Expected error in mat record6: "make-bar: invalid value <-int> for foreign type integer-32".
+! record.mo:Expected error in mat record6: "make-bar: invalid value 23.0 for foreign type integer-32".
+! record.mo:Expected error in mat record7: "make-bar: invalid value <int> for foreign type unsigned-32".
+! record.mo:Expected error in mat record7: "make-bar: invalid value <-int> for foreign type unsigned-32".
+! record.mo:Expected error in mat record7: "make-bar: invalid value 23.0 for foreign type unsigned-32".
+  record.mo:Expected error in mat record9: "record-reader: invalid input #f".
+  record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
+  record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
+--- 7104,7118 ----
+  record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
+  record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
+  record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
+! record.mo:Expected error in mat record4: "3 is not of type #<record type fudge>".
+! record.mo:Expected error in mat record5: "invalid value 4 for foreign type double-float".
+! record.mo:Expected error in mat record5: "invalid value 4 for foreign type double-float".
+! record.mo:Expected error in mat record6: "invalid value <int> for foreign type integer-32".
+! record.mo:Expected error in mat record6: "invalid value <-int> for foreign type integer-32".
+! record.mo:Expected error in mat record6: "invalid value 23.0 for foreign type integer-32".
+! record.mo:Expected error in mat record7: "invalid value <int> for foreign type unsigned-32".
+! record.mo:Expected error in mat record7: "invalid value <-int> for foreign type unsigned-32".
+! record.mo:Expected error in mat record7: "invalid value 23.0 for foreign type unsigned-32".
+  record.mo:Expected error in mat record9: "record-reader: invalid input #f".
+  record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
+  record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
+***************
+*** 7125,7150 ****
+  record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
+  record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
+  record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
+! record.mo:Expected error in mat record17: "make-$froz: invalid value 256 for foreign type unsigned-8".
+! record.mo:Expected error in mat record17: "make-$froz: invalid value -129 for foreign type unsigned-8".
+! record.mo:Expected error in mat record17: "make-$froz: invalid value 65536 for foreign type unsigned-16".
+! record.mo:Expected error in mat record17: "make-$froz: invalid value -32769 for foreign type unsigned-16".
+! record.mo:Expected error in mat record17: "make-$froz: invalid value 2 for foreign type double-float".
+! record.mo:Expected error in mat record17: "make-$froz: invalid value 3 for foreign type single-float".
+! record.mo:Expected error in mat record17: "set-$froz-x!: invalid value 256 for foreign type unsigned-8".
+! record.mo:Expected error in mat record17: "set-$froz-x!: invalid value -129 for foreign type unsigned-8".
+! record.mo:Expected error in mat record17: "set-$froz-y!: invalid value 2 for foreign type double-float".
+! record.mo:Expected error in mat record17: "set-$froz-z!: invalid value 2 for foreign type single-float".
+! record.mo:Expected error in mat record17: "set-$froz-w!: invalid value -32769 for foreign type unsigned-16".
+! record.mo:Expected error in mat record17: "set-$froz-w!: invalid value 65536 for foreign type unsigned-16".
+! record.mo:Expected error in mat record17: "make-$froz: invalid value 256 for foreign type integer-8".
+! record.mo:Expected error in mat record17: "make-$froz: invalid value -129 for foreign type integer-8".
+! record.mo:Expected error in mat record17: "make-$froz: invalid value 65536 for foreign type integer-16".
+! record.mo:Expected error in mat record17: "make-$froz: invalid value -32769 for foreign type integer-16".
+! record.mo:Expected error in mat record17: "set-$froz-x!: invalid value 256 for foreign type integer-8".
+! record.mo:Expected error in mat record17: "set-$froz-x!: invalid value -129 for foreign type integer-8".
+! record.mo:Expected error in mat record17: "set-$froz-w!: invalid value 65536 for foreign type integer-16".
+! record.mo:Expected error in mat record17: "set-$froz-w!: invalid value -32769 for foreign type integer-16".
+  record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
+  record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
+  record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
+--- 7125,7150 ----
+  record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
+  record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
+  record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
+! record.mo:Expected error in mat record17: "invalid value 256 for foreign type unsigned-8".
+! record.mo:Expected error in mat record17: "invalid value -129 for foreign type unsigned-8".
+! record.mo:Expected error in mat record17: "invalid value 65536 for foreign type unsigned-16".
+! record.mo:Expected error in mat record17: "invalid value -32769 for foreign type unsigned-16".
+! record.mo:Expected error in mat record17: "invalid value 2 for foreign type double-float".
+! record.mo:Expected error in mat record17: "invalid value 3 for foreign type single-float".
+! record.mo:Expected error in mat record17: "invalid value 256 for foreign type unsigned-8".
+! record.mo:Expected error in mat record17: "invalid value -129 for foreign type unsigned-8".
+! record.mo:Expected error in mat record17: "invalid value 2 for foreign type double-float".
+! record.mo:Expected error in mat record17: "invalid value 2 for foreign type single-float".
+! record.mo:Expected error in mat record17: "invalid value -32769 for foreign type unsigned-16".
+! record.mo:Expected error in mat record17: "invalid value 65536 for foreign type unsigned-16".
+! record.mo:Expected error in mat record17: "invalid value 256 for foreign type integer-8".
+! record.mo:Expected error in mat record17: "invalid value -129 for foreign type integer-8".
+! record.mo:Expected error in mat record17: "invalid value 65536 for foreign type integer-16".
+! record.mo:Expected error in mat record17: "invalid value -32769 for foreign type integer-16".
+! record.mo:Expected error in mat record17: "invalid value 256 for foreign type integer-8".
+! record.mo:Expected error in mat record17: "invalid value -129 for foreign type integer-8".
+! record.mo:Expected error in mat record17: "invalid value 65536 for foreign type integer-16".
+! record.mo:Expected error in mat record17: "invalid value -32769 for foreign type integer-16".
+  record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
+  record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
+  record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
+***************
+*** 7275,7313 ****
+  record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
+  record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
+  record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value 1.0 for foreign type int".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value 2.0 for foreign type unsigned".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value three for foreign type unsigned-int".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value 1/4 for foreign type short".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value "five" for foreign type unsigned-short".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value (6) for foreign type long".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value #(a b c d e f ...) for foreign type unsigned-long".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value ate for foreign type iptr".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value #\9 for foreign type uptr".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value 10 for foreign type float".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value 11.0+0.0i for foreign type double".
+! record.mo:Expected error in mat record25: "incorrect number of arguments to #<procedure make-r25-bar>".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value 12.0 for foreign type long-long".
+! record.mo:Expected error in mat record25: "make-r25-bar: invalid value 13.0 for foreign type unsigned-long-long".
+! record.mo:Expected error in mat record25: "set-r25-bar-a!: invalid value 3.0 for foreign type int".
+! record.mo:Expected error in mat record25: "set-r25-bar-b!: invalid value 3.0 for foreign type unsigned".
+! record.mo:Expected error in mat record25: "set-r25-bar-c!: invalid value 3.0 for foreign type unsigned-int".
+! record.mo:Expected error in mat record25: "set-r25-bar-d!: invalid value 3.0 for foreign type short".
+! record.mo:Expected error in mat record25: "set-r25-bar-e!: invalid value 3.0 for foreign type unsigned-short".
+! record.mo:Expected error in mat record25: "set-r25-bar-f!: invalid value 3.0 for foreign type long".
+! record.mo:Expected error in mat record25: "set-r25-bar-g!: invalid value 3.0 for foreign type unsigned-long".
+! record.mo:Expected error in mat record25: "set-r25-bar-h!: invalid value 3.0 for foreign type iptr".
+! record.mo:Expected error in mat record25: "set-r25-bar-i!: invalid value 3.0 for foreign type uptr".
+! record.mo:Expected error in mat record25: "set-r25-bar-j!: invalid value 3 for foreign type float".
+! record.mo:Expected error in mat record25: "set-r25-bar-k!: invalid value 3 for foreign type double".
+! record.mo:Expected error in mat record25: "set-r25-bar-m!: invalid value 3.0 for foreign type char".
+! record.mo:Expected error in mat record25: "set-r25-bar-n!: invalid value 3.0 for foreign type wchar".
+! record.mo:Expected error in mat record25: "set-r25-bar-o!: invalid value 3.0 for foreign type fixnum".
+! record.mo:Expected error in mat record25: "set-r25-bar-p!: invalid value 3.0 for foreign type void*".
+! record.mo:Expected error in mat record25: "set-r25-bar-r!: invalid value 3.0 for foreign type long-long".
+! record.mo:Expected error in mat record25: "set-r25-bar-s!: invalid value 3.0 for foreign type unsigned-long-long".
+! record.mo:Expected error in mat record25: "set-r25-bar-a!: invalid value <int> for foreign type int".
+! record.mo:Expected error in mat record25: "set-r25-bar-a!: invalid value <-int> for foreign type int".
+  record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
+  record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
+  record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
+--- 7275,7313 ----
+  record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
+  record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
+  record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
+! record.mo:Expected error in mat record25: "invalid value 1.0 for foreign type int".
+! record.mo:Expected error in mat record25: "invalid value 2.0 for foreign type unsigned".
+! record.mo:Expected error in mat record25: "invalid value three for foreign type unsigned-int".
+! record.mo:Expected error in mat record25: "invalid value 1/4 for foreign type short".
+! record.mo:Expected error in mat record25: "invalid value "five" for foreign type unsigned-short".
+! record.mo:Expected error in mat record25: "invalid value (6) for foreign type long".
+! record.mo:Expected error in mat record25: "invalid value #(a b c d e f ...) for foreign type unsigned-long".
+! record.mo:Expected error in mat record25: "invalid value ate for foreign type iptr".
+! record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
+! record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
+! record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
+! record.mo:Expected error in mat record25: "incorrect number of arguments to #<procedure>".
+! record.mo:Expected error in mat record25: "invalid value 12.0 for foreign type long-long".
+! record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type unsigned".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type unsigned-int".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type short".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type unsigned-short".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type long".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type unsigned-long".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type iptr".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type uptr".
+! record.mo:Expected error in mat record25: "invalid value 3 for foreign type float".
+! record.mo:Expected error in mat record25: "invalid value 3 for foreign type double".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type char".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type wchar".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type fixnum".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type void*".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type long-long".
+! record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type unsigned-long-long".
+! record.mo:Expected error in mat record25: "invalid value <int> for foreign type int".
+! record.mo:Expected error in mat record25: "invalid value <-int> for foreign type int".
+  record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
+  record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
+  record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
+***************
+*** 7333,7368 ****
+  record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
+  record.mo:Expected error in mat r6rs-records-procedural: "make-record-type-descriptor: cannot extend sealed record type #<record type bar>".
+  record.mo:Expected error in mat r6rs-records-syntactic: "invalid syntax point".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure make-point>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure make-point>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure make-point>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure point?>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure point?>".
+  record.mo:Expected error in mat r6rs-records-syntactic: "variable point-x-set! is not bound".
+  record.mo:Expected error in mat r6rs-records-syntactic: "variable point-y-set! is not bound".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure point-x>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure point-y>".
+  record.mo:Expected error in mat r6rs-records-syntactic: "record-mutator: field 0 of #<record type point> is immutable".
+  record.mo:Expected error in mat r6rs-records-syntactic: "record-mutator: field 1 of #<record type point> is immutable".
+  record.mo:Expected error in mat r6rs-records-syntactic: "invalid syntax point".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure make-point>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure make-point>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure make-point>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure point?>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure point?>".
+  record.mo:Expected error in mat r6rs-records-syntactic: "variable point-x-set! is not bound".
+  record.mo:Expected error in mat r6rs-records-syntactic: "variable point-y-set! is not bound".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure point-x>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure point-y>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure frob-widget-set!>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure frob-widget-set!>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure frob-widget-set!>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure frob-widget-set!>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure frob-widget-set!>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure frob-widget-set!>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure setwid!>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure setwid!>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure setwid!>".
+  record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
+  record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
+  record.mo:Expected error in mat r6rs-records-syntactic: "parent record type is sealed ex3".
+--- 7333,7368 ----
+  record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
+  record.mo:Expected error in mat r6rs-records-procedural: "make-record-type-descriptor: cannot extend sealed record type #<record type bar>".
+  record.mo:Expected error in mat r6rs-records-syntactic: "invalid syntax point".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure constructor>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure constructor>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure constructor>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure predicate>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure predicate>".
+  record.mo:Expected error in mat r6rs-records-syntactic: "variable point-x-set! is not bound".
+  record.mo:Expected error in mat r6rs-records-syntactic: "variable point-y-set! is not bound".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure accessor>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure accessor>".
+  record.mo:Expected error in mat r6rs-records-syntactic: "record-mutator: field 0 of #<record type point> is immutable".
+  record.mo:Expected error in mat r6rs-records-syntactic: "record-mutator: field 1 of #<record type point> is immutable".
+  record.mo:Expected error in mat r6rs-records-syntactic: "invalid syntax point".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure constructor>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure constructor>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure constructor>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure predicate>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure predicate>".
+  record.mo:Expected error in mat r6rs-records-syntactic: "variable point-x-set! is not bound".
+  record.mo:Expected error in mat r6rs-records-syntactic: "variable point-y-set! is not bound".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure accessor>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure accessor>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure mutator>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure mutator>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure mutator>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure mutator>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure mutator>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure mutator>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure mutator>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure mutator>".
+! record.mo:Expected error in mat r6rs-records-syntactic: "incorrect number of arguments to #<procedure mutator>".
+  record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
+  record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
+  record.mo:Expected error in mat r6rs-records-syntactic: "parent record type is sealed ex3".
+***************
+*** 9939,9948 ****
+  exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
+  exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
+  exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
+! oop.mo:Expected error in mat oop: "incorrect number of arguments to #<procedure make-<a>>".
+! oop.mo:Expected error in mat oop: "incorrect number of arguments to #<procedure make-<a>>".
+! oop.mo:Expected error in mat oop: "incorrect number of arguments to #<procedure m1>".
+! oop.mo:Expected error in mat oop: "incorrect number of arguments to #<procedure m1>".
+  oop.mo:Expected error in mat oop: "m1: not applicable to 17".
+  oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
+  oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
+--- 9939,9948 ----
+  exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
+  exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
+  exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
+! oop.mo:Expected error in mat oop: "incorrect number of arguments to #<procedure>".
+! oop.mo:Expected error in mat oop: "incorrect number of arguments to #<procedure>".
+! oop.mo:Expected error in mat oop: "incorrect number of arguments to #<procedure>".
+! oop.mo:Expected error in mat oop: "incorrect number of arguments to #<procedure>".
+  oop.mo:Expected error in mat oop: "m1: not applicable to 17".
+  oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
+  oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".

mats/patch-interpret-3-t-f-f

@@ -1,5 +1,5 @@
-*** errors-compile-3-t-f-f	2017-05-28 23:30:31.000000000 -0400
+*** errors-compile-3-t-f-f	2017-06-06 16:40:11.147295805 -0400
---- errors-interpret-3-t-f-f	2017-05-29 00:44:38.000000000 -0400
+--- errors-interpret-3-t-f-f	2017-06-06 17:42:49.478165307 -0400
 ***************
 *** 1,3 ****
 --- 1,9 ----

mats/patch-interpret-3-t-t-f

@@ -1,5 +1,5 @@
-*** errors-compile-3-t-t-f	2017-05-28 23:25:02.000000000 -0400
+*** errors-compile-3-t-t-f	2017-06-06 16:44:51.178581446 -0400
---- errors-interpret-3-t-t-f	2017-05-29 00:50:59.000000000 -0400
+--- errors-interpret-3-t-t-f	2017-06-06 17:48:13.954153204 -0400
 ***************
 *** 1,3 ****
 --- 1,9 ----

mats/root-experr-compile-0-f-f-f

@@ -9851,7 +9851,6 @@ date.mo:Expected error in mat date: "incorrect argument count in call (make-date
 date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1)".
 date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1 ...)".
 date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1 ...)".
-date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1 ...)".
 date.mo:Expected error in mat date: "make-date: invalid nanosecond -1".
 date.mo:Expected error in mat date: "make-date: invalid nanosecond <int>".
 date.mo:Expected error in mat date: "make-date: invalid nanosecond zero".
@@ -9919,10 +9918,18 @@ date.mo:Expected error in mat date: "incorrect argument count in call (date-year
 date.mo:Expected error in mat date: "incorrect argument count in call (date-year-day $date-d1 #t)".
 date.mo:Expected error in mat date: "date-year-day: 17 is not a date record".
 date.mo:Expected error in mat date: "date-year-day: <time> is not a date record".
+date.mo:Expected error in mat date: "incorrect argument count in call (date-dst?)".
+date.mo:Expected error in mat date: "incorrect argument count in call (date-dst? $date-d1 #t)".
+date.mo:Expected error in mat date: "date-dst?: 17 is not a date record".
+date.mo:Expected error in mat date: "date-dst?: <time> is not a date record".
 date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-offset)".
 date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-offset $date-d1 #t)".
 date.mo:Expected error in mat date: "date-zone-offset: 17 is not a date record".
 date.mo:Expected error in mat date: "date-zone-offset: <time> is not a date record".
+date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-name)".
+date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-name $date-d1 #t)".
+date.mo:Expected error in mat date: "date-zone-name: 17 is not a date record".
+date.mo:Expected error in mat date: "date-zone-name: <time> is not a date record".
 date.mo:Expected error in mat date: "incorrect argument count in call (current-date 0 #t)".
 date.mo:Expected error in mat date: "current-date: invalid time-zone offset -90000".
 date.mo:Expected error in mat date: "current-date: invalid time-zone offset 90000".

mats/root-experr-compile-2-f-f-f

@@ -9851,7 +9851,6 @@ date.mo:Expected error in mat date: "incorrect argument count in call (make-date
 date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1)".
 date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1 ...)".
 date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1 ...)".
-date.mo:Expected error in mat date: "incorrect argument count in call (make-date 0 0 0 0 1 ...)".
 date.mo:Expected error in mat date: "make-date: invalid nanosecond -1".
 date.mo:Expected error in mat date: "make-date: invalid nanosecond <int>".
 date.mo:Expected error in mat date: "make-date: invalid nanosecond zero".
@@ -9919,10 +9918,18 @@ date.mo:Expected error in mat date: "incorrect argument count in call (date-year
 date.mo:Expected error in mat date: "incorrect argument count in call (date-year-day $date-d1 #t)".
 date.mo:Expected error in mat date: "date-year-day: 17 is not a date record".
 date.mo:Expected error in mat date: "date-year-day: <time> is not a date record".
+date.mo:Expected error in mat date: "incorrect argument count in call (date-dst?)".
+date.mo:Expected error in mat date: "incorrect argument count in call (date-dst? $date-d1 #t)".
+date.mo:Expected error in mat date: "date-dst?: 17 is not a date record".
+date.mo:Expected error in mat date: "date-dst?: <time> is not a date record".
 date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-offset)".
 date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-offset $date-d1 #t)".
 date.mo:Expected error in mat date: "date-zone-offset: 17 is not a date record".
 date.mo:Expected error in mat date: "date-zone-offset: <time> is not a date record".
+date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-name)".
+date.mo:Expected error in mat date: "incorrect argument count in call (date-zone-name $date-d1 #t)".
+date.mo:Expected error in mat date: "date-zone-name: 17 is not a date record".
+date.mo:Expected error in mat date: "date-zone-name: <time> is not a date record".
 date.mo:Expected error in mat date: "incorrect argument count in call (current-date 0 #t)".
 date.mo:Expected error in mat date: "current-date: invalid time-zone offset -90000".
 date.mo:Expected error in mat date: "current-date: invalid time-zone offset 90000".

release_notes/release_notes.stex

@@ -87,6 +87,14 @@ thread was awakened by the condition before the timeout. The
 \scheme{time-utc}, or it can be \scheme{#f} for no timeout (the
 default).
 
+\subsection{\protect\scheme{date-dst?} and \protect\scheme{date-zone-name} (9.4.1)}
+
+The new primitive procedures \scheme{date-dst?} and
+\scheme{date-zone-name} access time-zone information for a
+\scheme{date} record that is created without an explicit
+zone offset. The zone-offset argument to \scheme{make-date}
+is now optional.
+
 \subsection{\protect\scheme{procedure-arity-mask} (9.4.1)}
 
 The new primitive procedure \scheme{procedure-arity-mask} takes a
@@ -1490,20 +1498,25 @@ in fasl files does not generally make sense.
 %-----------------------------------------------------------------------------
 \section{Bug Fixes}\label{section:bugfixes}
 
-\subsection{Overflow detection for \protect\scheme{fxsll},
+\subsection{Invalid memory references involving complex numbers (9.4.1)} 
-\protect\scheme{fxarithmetic-shift-left}, and
+
-\protect\scheme{fxarithmetic-shift}}
+A bug on 64-bit platforms that occasionally caused invalid memory
+references when operating on inexact complex numbers or the imaginary parts
+of inexact complex numbers has been fixed.
+[This bug dated back to Version 8.9.1.]
+
+\subsection{Overflow detection for left-shift operations on fixnums (9.4.1)}
 
 A bug that caused \scheme{fxsll}, \scheme{fxarithmetic-shift-left},
 and \scheme{fxarithmetic-shift} to fail to detect overflow in certain
-cases was fixed.
+cases has been fixed.
-[This bug dated back to Version 7.1 or earlier.]
+[This bug dated back to Version 4.0.]
 
-\subsection{Invalid memory reference when \protect\scheme{enum-set-indexer} procedure is not passed a symbol}
+\subsection{Missing \protect\scheme{enum-set-indexer} argument check (9.4.1)}
 
-A bug that caused the procedure returned by \scheme{enum-set-indexer}
+A missing argument check that resulted in the procedure returned by \scheme{enum-set-indexer}
-to perform an invalid memory reference when passed an argument that is
+causing an invalid memory reference when passed a non-symbol argument has been fixed.
-not a symbol has been fixed.
+[This bug dated back to Version 7.5.]
 
 \subsection{Storage for inaccessible mutexes and conditions is reclaimed (9.4.1)}
 

s/cmacros.ss

@@ -1857,7 +1857,8 @@
 (define-constant dtvec-yday 8)
 (define-constant dtvec-isdst 9)
 (define-constant dtvec-tzoff 10)
-(define-constant dtvec-size 11)
+(define-constant dtvec-tzname 11)
+(define-constant dtvec-size 12)
 
 (define-constant time-process 0)
 (define-constant time-thread 1)

s/cpnanopass.ss

@@ -6313,9 +6313,10 @@
               (let ([cnt (- pos (constant fixnum-offset))]
                     [mask (* (- (expt 2 size) 1) (expt 2 (constant fixnum-offset)))])
                 (%inline logand
-                  ,(let ([body (%mref ,e1 ,(constant-case native-endianness
+                  ,(let ([body `(inline ,(make-info-load 'integer-32 #f) ,%load ,e1 ,%zero
-                                             [(little) (fx+ (constant flonum-data-disp) 4)]
+                                  (immediate ,(constant-case native-endianness
-                                             [(big) (constant flonum-data-disp)]))])
+                                                [(little) (fx+ (constant flonum-data-disp) 4)]
+                                                [(big) (constant flonum-data-disp)])))])
                      (let ([body (if (fx> cnt 0)
                                      (%inline srl ,body (immediate ,cnt))
                                      body)])

s/date.ss

@@ -96,7 +96,7 @@
       (scheme-object)
       scheme-object))
 
-  (define $mktime ; dtvec -> tspair                (returns #f on error)
+  (define $mktime ; dtvec -> tspair        (returns #f on error)
     (foreign-procedure "(cs)mktime"
       (scheme-object)
       scheme-object))
@@ -369,23 +369,30 @@
            ($oops 'date-and-time "failed for date record ~s" dt))]))
 
   (set! make-date
-    (lambda (nsec sec min hour day mon year tz)
+    (let ([do-make-date
-      (check-nsec 'make-date nsec)
+           (lambda (nsec sec min hour day mon year tz tz-provided?)
-      (check-sec 'make-date sec)
+             (check-nsec 'make-date nsec)
-      (check-min 'make-date min)
+             (check-sec 'make-date sec)
-      (check-hour 'make-date hour)
+             (check-min 'make-date min)
-     ; need more accurate check for day based on year and month
+             (check-hour 'make-date hour)
-      (check-day 'make-date day)
+            ; need more accurate check for day based on year and month
-      (check-mon 'make-date mon)
+             (check-day 'make-date day)
-      (check-year 'make-date year)
+             (check-mon 'make-date mon)
-      (check-tz 'make-date tz)
+             (check-year 'make-date year)
-     ; keep in sync with cmacros.ss declarations of dtvec-nsec, etc.
+             (when tz-provided?
-      (let ([dtvec (vector nsec sec min hour day mon (- year 1900) 0 0 0 tz)])
+               (check-tz 'make-date tz))
-        (unless ($mktime dtvec) ; for effect on dtvec
+            ; keep in sync with cmacros.ss declarations of dtvec-nsec, etc.
-          ($oops 'make-date "invalid combination of arguments"))
+             (let ([dtvec (vector nsec sec min hour day mon (- year 1900) 0 #f 0 tz #f)])
-        (unless (fx= (vector-ref dtvec (constant dtvec-mday)) day)
+               (unless ($mktime dtvec) ; for effect on dtvec
-          ($oops 'make-date "invalid day ~s for month ~s and year ~s" day mon year))
+                 ($oops 'make-date "invalid combination of arguments"))
-        (make-dt dtvec))))
+               (unless (fx= (vector-ref dtvec (constant dtvec-mday)) day)
+                 ($oops 'make-date "invalid day ~s for month ~s and year ~s" day mon year))
+               (make-dt dtvec)))])
+      (case-lambda
+       [(nsec sec min hour day mon year tz)
+        (do-make-date nsec sec min hour day mon year tz #t)]
+       [(nsec sec min hour day mon year)
+        (do-make-date nsec sec min hour day mon year #f #f)])))
 
   (set! date? (lambda (x) (dt? x)))
 
@@ -407,7 +414,9 @@
    ; date-year is below
     (date-getter date-week-day (constant dtvec-wday))
     (date-getter date-year-day (constant dtvec-yday))
-    (date-getter date-zone-offset (constant dtvec-tzoff)))
+    (date-getter date-dst? (constant dtvec-isdst))
+    (date-getter date-zone-offset (constant dtvec-tzoff))
+    (date-getter date-zone-name (constant dtvec-tzname)))
 
   (set! date-year
     (lambda (dt)
@@ -439,7 +448,7 @@
   (set-who! date->time-utc
     (lambda (dt)
       (check-dt who dt)
-      (let ([p ($mktime (dt-vec dt))])
+      (let ([p ($mktime (vector-copy (dt-vec dt)))])
         (unless p ($oops who "conversion failed for ~s" dt))
         (make-ts (constant time-utc) p))))
 )

s/primdata.ss

@@ -863,10 +863,14 @@
   (date-second [sig [(date) -> (fixnum)]] [flags pure mifoldable discard true])
   (date-week-day [sig [(date) -> (fixnum)]] [flags pure mifoldable discard true])
   (date-year-day [sig [(date) -> (fixnum)]] [flags pure mifoldable discard true])
+  (date-dst? [sig [(date) -> (boolean)]] [flags pure mifoldable discard])
   (date-year [sig [(date) -> (fixnum)]] [flags pure mifoldable discard true])
   (date-zone-offset [sig [(date) -> (fixnum)]] [flags pure mifoldable discard true])
+  (date-zone-name [sig [(date) -> (ptr)]] [flags pure mifoldable discard])
   (date->time-utc [sig [(date) -> (time)]] [flags alloc])
-  (make-date [sig [(sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-fixnum) -> (date)]] [flags alloc])
+  (make-date [sig [(sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-fixnum) -> (date)]
+                  [(sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum sub-ufixnum) -> (date)]]
+             [flags alloc])
   (make-time [sig [(sub-symbol sub-ufixnum sub-fixnum) -> (time)]] [flags alloc])
   (set-time-nanosecond! [sig [(time sub-uint) -> (void)]] [flags true])
   (set-time-second! [sig [(time sub-fixnum) -> (void)]] [flags true])