From c333ad1addafae69ff5ce81597e1fc42ff93301d Mon Sep 17 00:00:00 2001
From: Richard Kistruck <rhsk@ravenbrook.com>
Date: Fri, 22 Jun 2007 17:19:23 +0100
Subject: [PATCH] mps br/diag: trace.c: (fix w3 build) cast integer character
 constant to char

w3build.bat: prepare for experimental release exp-162647

Copied from Perforce
 Change: 162647
 ServerID: perforce.ravenbrook.com
---
 mps/code/trace.c     | 22 +++++++++++-----------
 mps/code/w3build.bat |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mps/code/trace.c b/mps/code/trace.c
index a95d761e293..b01ecfba89f 100644
--- a/mps/code/trace.c
+++ b/mps/code/trace.c
@@ -1008,21 +1008,21 @@ static Bool traceFindGrey(Seg *segReturn, Rank *rankReturn,
 
   found = traceFindGreyORIGINAL(segReturn, rankReturn, arena, ti);
 
-  this = (char) ( !found ? '.'
-                  : (*rankReturn == RankAMBIG) ? 'A'
-                  : (*rankReturn == RankEXACT) ? 'E'
-                  : (*rankReturn == RankFINAL) ? 'F'
-                  : (*rankReturn == RankWEAK) ? 'W'
-                  : '?' );
+  this = (char)(!found ? '.'
+                : (*rankReturn == RankAMBIG) ? 'A'
+                : (*rankReturn == RankEXACT) ? 'E'
+                : (*rankReturn == RankFINAL) ? 'F'
+                : (*rankReturn == RankWEAK) ? 'W'
+                : '?');
 
-  if (prev == '.') {
+  if(prev == '.') {
     /* First seg of new trace */
     prev = this;
     segcount = 0;
     report_lim = report_array;
   }
 
-  if (this == prev) {
+  if(this == prev) {
     segcount += 1;
   } else {
     /* Change of rank: */
@@ -1030,9 +1030,9 @@ static Bool traceFindGrey(Seg *segReturn, Rank *rankReturn,
     *report_lim++ = prev;
     /* add segcount [0..9, a..z (x10), or *] to report */
     if(segcount < 10) {
-      *report_lim++ = '0' + segcount;
+      *report_lim++ = (char)('0' + segcount);
     } else if(segcount < 260) {
-      *report_lim++ = ('a' - 1) + (segcount / 10);
+      *report_lim++ = (char)(('a' - 1) + (segcount / 10));
     } else {
       *report_lim++ = '*';
     }
@@ -1041,7 +1041,7 @@ static Bool traceFindGrey(Seg *segReturn, Rank *rankReturn,
     segcount = 1;
   }
   
-  if (!found) {
+  if(!found) {
     /* No more grey in this trace: output report */
     AVER(this == '.');
     AVER(segcount == 1);  /* single failed attempt to find a seg */
diff --git a/mps/code/w3build.bat b/mps/code/w3build.bat
index b0d6a476da7..bce2049352f 100755
--- a/mps/code/w3build.bat
+++ b/mps/code/w3build.bat
@@ -6,7 +6,7 @@
 @rem Copyright (C) 2005-2007 Ravenbrook Limited.  All rights reserved.
 
 
-@set mpsreleasename=exp-162399
+@set mpsreleasename=exp-162647
 
 
 rmdir /q/s w3i3mv