14 files changed, 49 insertions, 139 deletions
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.10_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.10_T1.js
index 60e1a4bd8..fcd724045 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.10_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.10_T1.js
@@ -13,12 +13,7 @@ description: Complex tests
 
 //CHECK
 var result = true;
-var interval = [
-  [0x00, 0x29],
-  [0x40, 0x40],
-  [0x47, 0x60],
-  [0x67, 0xFFFF]
-];
+var interval = [[0x00, 0x29], [0x40,0x40], [0x47, 0x60], [0x67, 0xFFFF]];
 for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.11_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.11_T1.js
index fe8b1522c..33fa65d21 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.11_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.11_T1.js
@@ -16,12 +16,7 @@ description: >
 
 //CHECK
 var result = true;
-var interval = [
-  [0x00, 0x29],
-  [0x40, 0x40],
-  [0x47, 0x60],
-  [0x67, 0xFFFF]
-];
+var interval = [[0x00, 0x29], [0x40,0x40], [0x47, 0x60], [0x67, 0xFFFF]];
 for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.11_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.11_T2.js
index 20ed6651e..9752e4298 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.11_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.11_T2.js
@@ -16,12 +16,7 @@ description: >
 
 //CHECK
 var result = true;
-var interval = [
-  [0x00, 0x29],
-  [0x40, 0x40],
-  [0x47, 0x60],
-  [0x67, 0xFFFF]
-];
+var interval = [[0x00, 0x29], [0x40,0x40], [0x47, 0x60], [0x67, 0xFFFF]];
 for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T1.js
index ef1bd2624..8c8e4e824 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T1.js
@@ -17,12 +17,7 @@ description: >
 
 //CHECK
 var result = true;
-var interval = [
-  [0x00, 0x29],
-  [0x40, 0x40],
-  [0x47, 0x60],
-  [0x67, 0xFFFF]
-];
+var interval = [[0x00, 0x29], [0x40,0x40], [0x47, 0x60], [0x67, 0xFFFF]];
 for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T2.js
index ffc0a9814..acb718faf 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T2.js
@@ -17,12 +17,7 @@ description: >
 
 //CHECK
 var result = true;
-var interval = [
-  [0x00, 0x29],
-  [0x40, 0x40],
-  [0x47, 0x60],
-  [0x67, 0xFFFF]
-];
+var interval = [[0x00, 0x29], [0x40,0x40], [0x47, 0x60], [0x67, 0xFFFF]];
 for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T3.js
index f7f0f8d51..226bdb476 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.12_T3.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T3.js
@@ -17,12 +17,7 @@ description: >
 
 //CHECK
 var result = true;
-var interval = [
-  [0x00, 0x29],
-  [0x40, 0x40],
-  [0x47, 0x60],
-  [0x67, 0xFFFF]
-];
+var interval = [[0x00, 0x29], [0x40,0x40], [0x47, 0x60], [0x67, 0xFFFF]];
 for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.1_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.1_T1.js
index 6905a3853..2ee47854c 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.1_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.1_T1.js
@@ -15,7 +15,7 @@ var result = true;
 try {
   decodeURI("%");
   result = false;
-} catch (e) {
+} catch(e) {
   if ((e instanceof URIError) !== true) {
     result = false;
   }
@@ -25,7 +25,7 @@ try {
 try {
   decodeURI("%A");
   result = false;
-} catch (e) {
+} catch(e) {
   if ((e instanceof URIError) !== true) {
     result = false;
   }
@@ -35,7 +35,7 @@ try {
 try {
   decodeURI("%1");
   result = false;
-} catch (e) {
+} catch(e) {
   if ((e instanceof URIError) !== true) {
     result = false;
   }
@@ -45,7 +45,7 @@ try {
 try {
   decodeURI("% ");
   result = false;
-} catch (e) {
+} catch(e) {
   if ((e instanceof URIError) !== true) {
     result = false;
   }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.2_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.2_T1.js
index 5f6354bf6..5a30805bb 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.2_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.2_T1.js
@@ -13,12 +13,7 @@ description: Complex tests
 
 //CHECK
 var result = true;
-var interval = [
-  [0x00, 0x29],
-  [0x40, 0x40],
-  [0x47, 0x60],
-  [0x67, 0xFFFF]
-];
+var interval = [[0x00, 0x29], [0x40,0x40], [0x47, 0x60], [0x67, 0xFFFF]];
 for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A1.2_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.2_T2.js
index 234066125..5944e67bf 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A1.2_T2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A1.2_T2.js
@@ -13,12 +13,7 @@ description: Complex tests
 
 //CHECK
 var result = true;
-var interval = [
-  [0x00, 0x29],
-  [0x40, 0x40],
-  [0x47, 0x60],
-  [0x67, 0xFFFF]
-];
+var interval = [[0x00, 0x29], [0x40,0x40], [0x47, 0x60], [0x67, 0xFFFF]];
 for (var indexI = 0; indexI < interval.length; indexI++) {
   for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) {
     try {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A2.1_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.1_T1.js
index 642313140..477ef8460 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A2.1_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A2.1_T1.js
@@ -22,7 +22,7 @@ for (var indexI = 0; indexI <= 65535; indexI++) {
         $ERROR('#' + hex + ' ');
         errorCount++;
       }
-    } catch (e) {
+    } catch (e){
       $ERROR('#' + hex + ' ');
       errorCount++;
     }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A2.2_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.2_T1.js
index a609d0114..71e8c31d4 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A2.2_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A2.2_T1.js
@@ -16,36 +16,36 @@ var indexP;
 var indexO = 0;
 var uriReserved = [";", "/", "?", ":", "@", "&", "=", "+", "$", ","];
 l:
-  for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) {
-    count++;
-    var hexB1 = decimalToPercentHexString(indexB1);
-    var index = indexB1;
-    var hex = String.fromCharCode(index);
-    for (var indexC = 0; indexC < uriReserved.length; indexC++) {
-      if (hex === uriReserved[indexC]) continue l;
-    }
-    if (hex === "#") continue;
-    if (decodeURI(hexB1) === hex) continue;
+for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) {
+  count++;
+  var hexB1 = decimalToPercentHexString(indexB1);
+  var index = indexB1;
+  var hex = String.fromCharCode(index);
+  for (var indexC = 0; indexC < uriReserved.length; indexC++) {
+    if (hex === uriReserved[indexC]) continue l;
+  }
+  if (hex === "#") continue;
+  if (decodeURI(hexB1) === hex) continue;
 
-    if (indexO === 0) {
-      indexO = index;
-    } else {
-      if ((index - indexP) !== 1) {
-        if ((indexP - indexO) !== 0) {
-          var hexP = decimalToHexString(indexP);
-          var hexO = decimalToHexString(indexO);
-          $ERROR('#' + hexO + '-' + hexP + ' ');
-        }
-        else {
-          var hexP = decimalToHexString(indexP);
-          $ERROR('#' + hexP + ' ');
-        }
-        indexO = index;
+  if (indexO === 0) {
+    indexO = index;
+  } else {
+    if ((index - indexP) !== 1) {
+      if ((indexP - indexO) !== 0) {
+        var hexP = decimalToHexString(indexP);
+        var hexO = decimalToHexString(indexO);
+        $ERROR('#' + hexO + '-' + hexP + ' ');
       }
+      else {
+        var hexP = decimalToHexString(indexP);
+        $ERROR('#' + hexP + ' ');
+      }
+      indexO = index;
     }
-    indexP = index;
-    errorCount++;
   }
+  indexP = index;
+  errorCount++;
+}
 
 if (errorCount > 0) {
   if ((indexP - indexO) !== 0) {
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A5.1.js b/test/built-ins/decodeURI/S15.1.3.1_A5.1.js
index ccc2da700..a5517ed7e 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A5.1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A5.1.js
@@ -16,7 +16,7 @@ if (decodeURI.propertyIsEnumerable('length') !== false) {
 
 //CHECK#2
 var result = true;
-for (var p in decodeURI) {
+for (var p in decodeURI){
   if (p === "length") {
     result = false;
   }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A5.5.js b/test/built-ins/decodeURI/S15.1.3.1_A5.5.js
index 3d64f22d1..c088525b2 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A5.5.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A5.5.js
@@ -16,7 +16,7 @@ if (this.propertyIsEnumerable('decodeURI') !== false) {
 
 //CHECK#2
 var result = true;
-for (var p in this) {
+for (var p in this){
   if (p === "decodeURI") {
     result = false;
   }
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A6_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A6_T1.js
index 216de1349..e3789fbdf 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A6_T1.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A6_T1.js
@@ -10,51 +10,26 @@ description: If Type(value) is Object, evaluate ToPrimitive(value, String)
 ---*/
 
 //CHECK#1
-var object = {
-  valueOf: function() {
-    return "%5E"
-  }
-};
+var object = {valueOf: function() {return "%5E"}};
 if (decodeURI(object) !== "[object Object]") {
   $ERROR('#1: var object = {valueOf: function() {return "%5E"}}; decodeURI(object) === [object Object]. Actual: ' + (decodeURI(object)));
 }
 
 //CHECK#2
-var object = {
-  valueOf: function() {
-    return ""
-  },
-  toString: function() {
-    return "%5E"
-  }
-};
+var object = {valueOf: function() {return ""}, toString: function() {return "%5E"}};
 if (decodeURI(object) !== "^") {
   $ERROR('#2: var object = {valueOf: function() {return ""}, toString: function() {return "%5E"}}; decodeURI(object) === "^". Actual: ' + (decodeURI(object)));
 }
 
 //CHECK#3
-var object = {
-  valueOf: function() {
-    return "%5E"
-  },
-  toString: function() {
-    return {}
-  }
-};
+var object = {valueOf: function() {return "%5E"}, toString: function() {return {}}};
 if (decodeURI(object) !== "^") {
   $ERROR('#3: var object = {valueOf: function() {return "%5E"}, toString: function() {return {}}}; decodeURI(object) === "^". Actual: ' + (decodeURI(object)));
 }
 
 //CHECK#4
 try {
-  var object = {
-    valueOf: function() {
-      throw "error"
-    },
-    toString: function() {
-      return "%5E"
-    }
-  };
+  var object = {valueOf: function() {throw "error"}, toString: function() {return "%5E"}};
   if (decodeURI(object) !== "^") {
     $ERROR('#4.1: var object = {valueOf: function() {throw "error"}, toString: function() {return "%5E"}}; decodeURI(object) === "^". Actual: ' + (decodeURI(object)));
   }
@@ -68,38 +43,20 @@ catch (e) {
 }
 
 //CHECK#5
-var object = {
-  toString: function() {
-    return "%5E"
-  }
-};
+var object = {toString: function() {return "%5E"}};
 if (decodeURI(object) !== "^") {
   $ERROR('#5: var object = {toString: function() {return "%5E"}}; decodeURI(object) === "^". Actual: ' + (decodeURI(object)));
 }
 
 //CHECK#6
-var object = {
-  valueOf: function() {
-    return {}
-  },
-  toString: function() {
-    return "%5E"
-  }
-}
+var object = {valueOf: function() {return {}}, toString: function() {return "%5E"}}
 if (decodeURI(object) !== "^") {
   $ERROR('#6: var object = {valueOf: function() {return {}}, toString: function() {return "%5E"}}; decodeURI(object) === "^". Actual: ' + (decodeURI(object)));
 }
 
 //CHECK#7
 try {
-  var object = {
-    valueOf: function() {
-      return "%5E"
-    },
-    toString: function() {
-      throw "error"
-    }
-  };
+  var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}};
   decodeURI(object);
   $ERROR('#7.1: var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}}; decodeURI(object) throw "error". Actual: ' + (decodeURI(object)));
 }
@@ -111,14 +68,7 @@ catch (e) {
 
 //CHECK#8
 try {
-  var object = {
-    valueOf: function() {
-      return {}
-    },
-    toString: function() {
-      return {}
-    }
-  };
+  var object = {valueOf: function() {return {}}, toString: function() {return {}}};
   decodeURI(object);
   $ERROR('#8.1: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURI(object) throw TypeError. Actual: ' + (decodeURI(object)));
 }