[simd.js] Clean up bad merge in messages.js

src/messages.js

Index: src/messages.js
diff --git a/src/messages.js b/src/messages.js
index b9e2aae2133d9e49171834f1f54a5f4e0ef92cf9..a0176d34a24c0b1aa449dc5f35f62fd8f19317ae 100644
--- a/src/messages.js
+++ b/src/messages.js
@@ -48,16 +48,9 @@ var StringCharAt;
 var StringIndexOf;
 var StringSubstring;
 var ToString;
-var Float32x4ToString;
-var Int32x4ToString;
-var Uint32x4ToString;
-var Bool32x4ToString;
-var Int16x8ToString;
 var Uint16x8ToString;
-var Bool16x8ToString;
-var Int8x16ToString;
+var Uint32x4ToString;
 var Uint8x16ToString;
-var Bool8x16ToString;
 
 utils.Import(function(from) {
   ArrayJoin = from.ArrayJoin;
@@ -74,16 +67,9 @@ utils.Import(function(from) {
   StringCharAt = from.StringCharAt;
   StringIndexOf = from.StringIndexOf;
   StringSubstring = from.StringSubstring;
-  Float32x4ToString = from.Float32x4ToString;
-  Int32x4ToString = from.Int32x4ToString;
-  Uint32x4ToString = from.Uint32x4ToString;
-  Bool32x4ToString = from.Bool32x4ToString;
-  Int16x8ToString = from.Int16x8ToString;
   Uint16x8ToString = from.Uint16x8ToString;
-  Bool16x8ToString = from.Bool16x8ToString;
-  Int8x16ToString = from.Int8x16ToString;
+  Uint32x4ToString = from.Uint32x4ToString;
   Uint8x16ToString = from.Uint8x16ToString;
-  Bool8x16ToString = from.Bool8x16ToString;
 });
 
 utils.ImportNow(function(from) {
@@ -127,13 +113,13 @@ function NoSideEffectToString(obj) {
     switch (typeof(obj)) {
       case 'float32x4': return %_CallFunction(obj, Float32x4ToString);
       case 'int32x4':   return %_CallFunction(obj, Int32x4ToString);
-      case 'uint32x4':   return %_CallFunction(obj, Uint32x4ToString);
-      case 'bool32x4':  return %_CallFunction(obj, Bool32x4ToString);
       case 'int16x8':   return %_CallFunction(obj, Int16x8ToString);
-      case 'uint16x8':   return %_CallFunction(obj, Uint16x8ToString);
-      case 'bool16x8':  return %_CallFunction(obj, Bool16x8ToString);
       case 'int8x16':   return %_CallFunction(obj, Int8x16ToString);
+      case 'uint32x4':   return %_CallFunction(obj, Uint32x4ToString);
+      case 'uint16x8':   return %_CallFunction(obj, Uint16x8ToString);
       case 'uint8x16':   return %_CallFunction(obj, Uint8x16ToString);
+      case 'bool32x4':  return %_CallFunction(obj, Bool32x4ToString);
+      case 'bool16x8':  return %_CallFunction(obj, Bool16x8ToString);
       case 'bool8x16':  return %_CallFunction(obj, Bool8x16ToString);
     }
   }