diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.10_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.10_T1.js index f539680db8..c59e96e4ec 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.10_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.10_T1.js @@ -18,15 +18,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%C0%" + String.fromCharCode(indexJ, indexJ)); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 110xxxxx (n = 2) and (string.charAt(k + 4) and string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T1.js index 9d5cd46e3e..dbce64b258 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T1.js @@ -21,15 +21,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%E0%" + String.fromCharCode(indexJ, indexJ) + "%A0"); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T2.js index d1a3276aab..098fa45852 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.11_T2.js @@ -21,15 +21,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%E0%" + "%A0" + String.fromCharCode(indexJ, indexJ)); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 1110xxxx (n = 3) and (string.charAt(k + 7) and string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T1.js index a1af8c19d1..034cc57fac 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T1.js @@ -22,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%F0%" + String.fromCharCode(indexJ, indexJ) + "%A0%A0"); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 4) and string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T2.js index 547c962a0f..159148b3da 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T2.js @@ -22,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%F0%" + "%A0" + String.fromCharCode(indexJ, indexJ) + "%A0"); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 7) and string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T3.js index 567a6b19ae..13873864ff 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.12_T3.js @@ -22,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURIComponent("%F0%" + "%A0%A0" + String.fromCharCode(indexJ, indexJ)); - result = false; - } catch (e) { + result = false; + } catch (e) { if ((e instanceof URIError) !== true) { - result = false; + result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 10) and string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js index c264afe9b9..fc3ae33b18 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T1.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xC0; indexB <= 0xDF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js index 1de7c35bdf..55ea6e326a 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.13_T2.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xC0; indexB <= 0xDF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js index 068d44c3dc..c51ba39a6a 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T1.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xE0; indexB <= 0xEF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC + "%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js index a2bb81d08c..dc45457dda 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T2.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xE0; indexB <= 0xEF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0" + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js index b568be9097..107150f0bc 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T3.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xE0; indexB <= 0xEF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC + "%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js index 6b281516b6..f2003b21a3 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.14_T4.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xE0; indexB <= 0xEF; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0" + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js index 0d3806ba9b..baf51e3012 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T1.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC + "%A0%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js index d67d0b0ab1..2e602d45bf 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T2.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0" + hexC + "%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js index 9291ea7d62..ba7f129bbf 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T3.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0x00; indexC <= 0x7F; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0%A0" + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js index 2ca3b06397..631eaec9ca 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T4.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + hexC + "%A0%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js index d61c06a62d..e323559d52 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T5.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0" + hexC + "%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js index 0a1b4ec4bd..233a9c0c6c 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.15_T6.js @@ -18,37 +18,37 @@ var indexP; var indexO = 0; for (var indexB = 0xF0; indexB <= 0xF7; indexB++) { - count++; + count++; var hexB = decimalToPercentHexString(indexB); var result = true; for (var indexC = 0xC0; indexC <= 0xFF; indexC++) { var hexC = decimalToPercentHexString(indexC); try { decodeURIComponent(hexB + "%A0%A0" + hexC); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = indexB; } else { - if ((indexB - indexP) !== 1) { + if ((indexB - 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 = indexB; - } + } } indexP = indexB; - errorCount++; + errorCount++; } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T1.js index cda19db3e2..074a35718b 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T1.js @@ -19,14 +19,14 @@ for (var indexI = 0; indexI < interval.length; indexI++) { try { decodeURIComponent("%" + String.fromCharCode(indexJ) + "1"); result = false; - } catch (e) { + } catch (e) { if ((e instanceof URIError) !== true) { result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If string.charAt(k+1) does not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T2.js index 3053c49849..012cfb7a6b 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.2_T2.js @@ -19,14 +19,14 @@ for (var indexI = 0; indexI < interval.length; indexI++) { try { decodeURIComponent("%" + "1" + String.fromCharCode(indexJ)); result = false; - } catch (e) { + } catch (e) { if ((e instanceof URIError) !== true) { result = false; } - } - } -} + } + } +} -if (result !== true) { +if (result !== true) { $ERROR('#1: If string.charAt(k+2) does not represent hexadecimal digits, throw URIError'); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js index 938e8672d5..182677d442 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T1.js @@ -16,31 +16,31 @@ var indexP; var indexO = 0; for (var index = 0x80; index <= 0xBF; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } if (errorCount > 0) { @@ -51,6 +51,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js index f9d2819121..a9bc2157ea 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.3_T2.js @@ -16,31 +16,31 @@ var indexP; var indexO = 0; for (var index = 0xF8; index <= 0xFF; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } if (errorCount > 0) { @@ -51,6 +51,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js index 49d58d6f99..2d91c523fa 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.4_T1.js @@ -16,39 +16,39 @@ var indexP; var indexO = 0; for (var index = 0xC0; index <= 0xDF; index++) { - count++; + count++; var str = ""; var result = true; for (var len = 0; len < 3; len++) { var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + str); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; str = str + "1"; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; - } + errorCount++; + } } if (errorCount > 0) { @@ -59,6 +59,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js index e1a0fb2019..2bd11c744d 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.5_T1.js @@ -16,39 +16,39 @@ var indexP; var indexO = 0; for (var index = 0xE0; index <= 0xEF; index++) { - count++; + count++; var str = ""; var result = true; for (var len = 0; len < 6; len++) { var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + str); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; str = str + "1"; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; - } + errorCount++; + } } if (errorCount > 0) { @@ -59,6 +59,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js index be6c4f8395..10d53f10bc 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.6_T1.js @@ -16,39 +16,39 @@ var indexP; var indexO = 0; for (var index = 0xF0; index <= 0xF7; index++) { - count++; + count++; var str = ""; var result = true; for (var len = 0; len < 9; len++) { var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + str); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } result = false; str = str + "1"; } if (result !== true) { - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; - } + errorCount++; + } } if (errorCount > 0) { @@ -59,6 +59,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js index 4c69605224..fcc546ff78 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.7_T1.js @@ -18,31 +18,31 @@ var indexP; var indexO = 0; for (var index = 0xC0; index <= 0xDF; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "111"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } if (errorCount > 0) { @@ -53,6 +53,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js index cc71a90177..79e9119481 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T1.js @@ -19,31 +19,31 @@ var indexP; var indexO = 0; for (var index = 0xE0; index <= 0xEF; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "111%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } if (errorCount > 0) { @@ -54,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js index 9da70853a4..9600357f8c 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.8_T2.js @@ -19,31 +19,31 @@ var indexP; var indexO = 0; for (var index = 0xE0; index <= 0xEF; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "%A0111"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } if (errorCount > 0) { @@ -54,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js index 21fae9a187..6ca5ff3821 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T1.js @@ -19,31 +19,31 @@ var indexP; var indexO = 0; for (var index = 0xF0; index <= 0xF7; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "111%A0%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } if (errorCount > 0) { @@ -54,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js index f63d7e3bd6..7bf8b8778a 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T2.js @@ -19,31 +19,31 @@ var indexP; var indexO = 0; for (var index = 0xF0; index <= 0xF7; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "%A0111%A0"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } if (errorCount > 0) { @@ -54,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js index aea4a61f7c..19892da3e2 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A1.9_T3.js @@ -19,31 +19,31 @@ var indexP; var indexO = 0; for (var index = 0xF0; index <= 0xF7; index++) { - count++; + count++; var hex = decimalToPercentHexString(index); try { decodeURIComponent(hex + "%A0%A0111"); - } catch (e) { - if ((e instanceof URIError) === true) continue; + } catch (e) { + if ((e instanceof URIError) === true) continue; } - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } if (errorCount > 0) { @@ -54,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js index d0c40f8324..5ffde47cff 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.1_T1.js @@ -16,20 +16,20 @@ var count = 0; for (var indexI = 0; indexI <= 65535; indexI++) { if (indexI !== 0x25) { var hex = decimalToHexString(indexI); - try { + try { var str = String.fromCharCode(indexI); - if (decodeURIComponent(str) !== str) { + if (decodeURIComponent(str) !== str) { $ERROR('#' + hex + ' '); errorCount++; - } + } } catch (e){ $ERROR('#' + hex + ' '); errorCount++; - } + } count++; } -} +} -if (errorCount > 0) { +if (errorCount > 0) { $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js index 47d2e6b4f7..74bd1d8dd1 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.2_T1.js @@ -17,28 +17,28 @@ var indexO = 0; for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) { count++; var hexB1 = decimalToPercentHexString(indexB1); - var index = indexB1; + var index = indexB1; var hex = String.fromCharCode(index); if (decodeURIComponent(hexB1) === hex) continue; - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } if (errorCount > 0) { @@ -49,6 +49,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js index f31eabcdc4..96e7aeafb8 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.3_T1.js @@ -22,27 +22,27 @@ for (var indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) { for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) { count++; var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2); - var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F); + var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F); if (decodeURIComponent(hexB1_B2) === String.fromCharCode(index)) continue; - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } } @@ -54,6 +54,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js index b14588bc12..e444e9807a 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.4_T1.js @@ -22,33 +22,33 @@ for (var indexB1 = 0xE0; indexB1 <= 0xEF; indexB1++) { var hexB1 = decimalToPercentHexString(indexB1); for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) { if ((indexB1 === 0xE0) && (indexB2 <= 0x9F)) continue; - if ((indexB1 === 0xED) && (0xA0 <= indexB2)) continue; + if ((indexB1 === 0xED) && (0xA0 <= indexB2)) continue; var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2); for (var indexB3 = 0x80; indexB3 <= 0xBF; indexB3++) { count++; var hexB1_B2_B3 = hexB1_B2 + decimalToPercentHexString(indexB3); - var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F); + var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F); if (decodeURIComponent(hexB1_B2_B3) === String.fromCharCode(index)) continue; - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; - } + errorCount++; + } } } @@ -60,6 +60,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js index b50e67d4e0..062bf7c883 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A2.5_T1.js @@ -21,7 +21,7 @@ var indexO = 0; for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) { var hexB1 = decimalToPercentHexString(indexB1); for (var indexB2 = 0x80; indexB2 <= 0xBF; indexB2++) { - if ((indexB1 === 0xF0) && (indexB2 <= 0x9F)) continue; + if ((indexB1 === 0xF0) && (indexB2 <= 0x9F)) continue; if ((indexB1 === 0xF4) && (indexB2 >= 0x90)) continue; var hexB1_B2 = hexB1 + decimalToPercentHexString(indexB2); for (var indexB3 = 0x80; indexB3 <= 0xBF; indexB3++) { @@ -31,29 +31,29 @@ for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) { count++; var index = (indexB1 & 0x07) * 0x40000 + (indexB2 & 0x3F) * 0x1000 + (indexB3 & 0x3F) * 0x40 + (indexB4 & 0x3F); var L = ((index - 0x10000) & 0x03FF) + 0xDC00; - var H = (((index - 0x10000) >> 10) & 0x03FF) + 0xD800; + var H = (((index - 0x10000) >> 10) & 0x03FF) + 0xD800; if (decodeURIComponent(hexB1_B2_B3_B4) === String.fromCharCode(H, L)) continue; - if (indexO === 0) { + if (indexO === 0) { indexO = index; } else { - if ((index - indexP) !== 1) { + 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++; + errorCount++; } - } + } } } @@ -65,6 +65,6 @@ if (errorCount > 0) { } else { var hexP = decimalToHexString(indexP); $ERROR('#' + hexP + ' '); - } + } $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count + ' '); } diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T4.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T4.js index 5a430fdd48..9ab470c164 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T4.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A4_T4.js @@ -22,7 +22,7 @@ if (decodeURIComponent("http://unipro.ru") !== "http://unipro.ru") { //CHECK#3 if (decodeURIComponent("http:%2f%2Fwww.google.ru/support/jobs/bin/static.py%3Fpage%3dwhy-ru.html%26sid%3Dliveandwork") !== "http://www.google.ru/support/jobs/bin/static.py?page=why-ru.html&sid=liveandwork") { $ERROR('#3: http:%2f%2Fwww.google.ru/support/jobs/bin/static.py%3Fpage3dwhy-ru.html%26sid3Dliveandwork"'); -} +} //CHECK#4 if (decodeURIComponent("http:%2F%2Fen.wikipedia.org/wiki/UTF-8%23Description") !== "http://en.wikipedia.org/wiki/UTF-8#Description") { diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.1.js index c68dd817d0..e8d46165b7 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.1.js @@ -19,7 +19,7 @@ var result = true; for (var p in decodeURIComponent){ if (p === "length") { result = false; - } + } } if (result !== true) { diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.5.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.5.js index cec9cee1ff..e01cd5502f 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.5.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.5.js @@ -19,7 +19,7 @@ var result = true; for (var p in this){ if (p === "decodeURIComponent") { result = false; - } + } } if (result !== true) { diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A6_T1.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A6_T1.js index f458a6147f..cb27193eb2 100644 --- a/test/built-ins/decodeURIComponent/S15.1.3.2_A6_T1.js +++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A6_T1.js @@ -19,7 +19,7 @@ if (decodeURIComponent(object) !== "[object Object]") { var object = {valueOf: function() {return ""}, toString: function() {return "%5E"}}; if (decodeURIComponent(object) !== "^") { $ERROR('#2: var object = {valueOf: function() {return ""}, toString: function() {return "%5E"}}; decodeURIComponent(object) === "^". Actual: ' + (decodeURIComponent(object))); -} +} //CHECK#3 var object = {valueOf: function() {return "%5E"}, toString: function() {return {}}}; @@ -59,11 +59,11 @@ try { var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}}; decodeURIComponent(object); $ERROR('#7.1: var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}}; decodeURIComponent(object) throw "error". Actual: ' + (decodeURIComponent(object))); -} +} catch (e) { if (e !== "error") { $ERROR('#7.2: var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}}; decodeURIComponent(object) throw "error". Actual: ' + (e)); - } + } } //CHECK#8 @@ -71,9 +71,9 @@ try { var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURIComponent(object); $ERROR('#8.1: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURIComponent(object) throw TypeError. Actual: ' + (decodeURIComponent(object))); -} +} catch (e) { if ((e instanceof TypeError) !== true) { $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURIComponent(object) throw TypeError. Actual: ' + (e)); - } + } }