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 c9e3df54c8..16c116659d 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 @@ -18,15 +18,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURI("%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/decodeURI/S15.1.3.1_A1.11_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.11_T1.js index 40e418c86e..1aad74e682 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 @@ -21,15 +21,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURI("%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/decodeURI/S15.1.3.1_A1.11_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.11_T2.js index 3a12cc6a83..4e0a40c7bd 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 @@ -21,15 +21,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURI("%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/decodeURI/S15.1.3.1_A1.12_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T1.js index b5ab6de7e8..15f3a97dcc 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 @@ -22,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURI("%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/decodeURI/S15.1.3.1_A1.12_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T2.js index e5f01379f4..55ee69928f 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 @@ -22,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURI("%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/decodeURI/S15.1.3.1_A1.12_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A1.12_T3.js index ff8edc0ce0..c714d05783 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 @@ -22,15 +22,15 @@ for (var indexI = 0; indexI < interval.length; indexI++) { for (var indexJ = interval[indexI][0]; indexJ <= interval[indexI][1]; indexJ++) { try { decodeURI("%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/decodeURI/S15.1.3.1_A1.13_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.13_T1.js index e78898ca25..0d980a487b 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.13_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.13_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.13_T2.js index 671588ca1c..c1d9cecedc 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.13_T2.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.14_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T1.js index d2b106ac03..412575127d 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.14_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T2.js index 4f36e270f1..2e2a2b0cc3 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T2.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.14_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T3.js index c5cdbdd7a3..315a7a4c01 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T3.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.14_T4.js b/test/built-ins/decodeURI/S15.1.3.1_A1.14_T4.js index a54e21029f..6ab3b3ed83 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.14_T4.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.15_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T1.js index 2bb17b87f1..14e97441d9 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.15_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T2.js index 830123591f..ca13d5e665 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T2.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.15_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T3.js index 828e13e069..59b01b0cda 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T3.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.15_T4.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T4.js index 3abf267919..2bd806f743 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T4.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.15_T5.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T5.js index b9db4f2ebc..1253544963 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T5.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.15_T6.js b/test/built-ins/decodeURI/S15.1.3.1_A1.15_T6.js index bbfa0ec9f7..d8fc333ac3 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.15_T6.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.2_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.2_T1.js index fa05d72dbe..0bfc46bfe7 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 @@ -19,14 +19,14 @@ for (var indexI = 0; indexI < interval.length; indexI++) { try { decodeURI("%" + 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/decodeURI/S15.1.3.1_A1.2_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.2_T2.js index eb9d3790da..2a0b33e659 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 @@ -19,14 +19,14 @@ for (var indexI = 0; indexI < interval.length; indexI++) { try { decodeURI("%" + "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/decodeURI/S15.1.3.1_A1.3_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.3_T1.js index 237c430fbc..1b1dba7ec4 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.3_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.3_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.3_T2.js index f78753b34f..c9914c50c2 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.3_T2.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.4_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.4_T1.js index f181f77fa4..6ca4f2d415 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.4_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.5_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.5_T1.js index c8c85444f7..21a7aa0e70 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.5_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.6_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.6_T1.js index 0b0967a90b..7c7e35d073 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.6_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.7_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.7_T1.js index 2f0629e071..dac7d1cb43 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.7_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.8_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.8_T1.js index f3bdbf7aa4..3ecca0b37b 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.8_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.8_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.8_T2.js index 8da34671bd..59e54cd847 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.8_T2.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.9_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A1.9_T1.js index 9cdcedd696..70e7f37c1f 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.9_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.9_T2.js b/test/built-ins/decodeURI/S15.1.3.1_A1.9_T2.js index a4d7e20371..7f4e55fb9f 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.9_T2.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A1.9_T3.js b/test/built-ins/decodeURI/S15.1.3.1_A1.9_T3.js index 772cb25a30..88648791e7 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A1.9_T3.js +++ b/test/built-ins/decodeURI/S15.1.3.1_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 { decodeURI(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/decodeURI/S15.1.3.1_A2.1_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.1_T1.js index 38bf4d4a64..477ef8460c 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 @@ -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 (decodeURI(str) !== str) { + if (decodeURI(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/decodeURI/S15.1.3.1_A2.2_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.2_T1.js index 1e64a892b2..71e8c31d44 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,10 +16,10 @@ var indexP; var indexO = 0; var uriReserved = [";", "/", "?", ":", "@", "&", "=", "+", "$", ","]; l: -for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) { +for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) { count++; var hexB1 = decimalToPercentHexString(indexB1); - var index = indexB1; + var index = indexB1; var hex = String.fromCharCode(index); for (var indexC = 0; indexC < uriReserved.length; indexC++) { if (hex === uriReserved[indexC]) continue l; @@ -27,24 +27,24 @@ for (var indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) { if (hex === "#") continue; if (decodeURI(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) { @@ -55,6 +55,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/decodeURI/S15.1.3.1_A2.3_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.3_T1.js index 5b90f71218..02aeafbf75 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A2.3_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_A2.3_T1.js @@ -17,32 +17,32 @@ var count = 0; var indexP; var indexO = 0; -for (var indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) { +for (var indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) { var hexB1 = decimalToPercentHexString(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 (decodeURI(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/decodeURI/S15.1.3.1_A2.4_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.4_T1.js index f3cf70fdd5..628b40b11d 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A2.4_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_A2.4_T1.js @@ -18,37 +18,37 @@ var count = 0; var indexP; var indexO = 0; -for (var indexB1 = 0xE0; indexB1 <= 0xEF; indexB1++) { +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 (decodeURI(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/decodeURI/S15.1.3.1_A2.5_T1.js b/test/built-ins/decodeURI/S15.1.3.1_A2.5_T1.js index 98ce4b0fef..7550935add 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A2.5_T1.js +++ b/test/built-ins/decodeURI/S15.1.3.1_A2.5_T1.js @@ -18,10 +18,10 @@ var count = 0; var indexP; var indexO = 0; -for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) { +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 (decodeURI(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/decodeURI/S15.1.3.1_A4_T4.js b/test/built-ins/decodeURI/S15.1.3.1_A4_T4.js index 726ad0bce2..ced956a032 100644 --- a/test/built-ins/decodeURI/S15.1.3.1_A4_T4.js +++ b/test/built-ins/decodeURI/S15.1.3.1_A4_T4.js @@ -22,7 +22,7 @@ if (decodeURI("http:%2f%2Funipro.ru") !== "http:%2f%2Funipro.ru") { //CHECK#3 if (decodeURI("http://www.google.ru/support/jobs/bin/static.py%3Fpage%3dwhy-ru.html%26sid%3Dliveandwork") !== "http://www.google.ru/support/jobs/bin/static.py%3Fpage%3dwhy-ru.html%26sid%3Dliveandwork") { $ERROR('#3: http://www.google.ru/support/jobs/bin/static.py%3Fpage%3dwhy-ru.html%26sid%3Dliveandwork"'); -} +} //CHECK%234 if (decodeURI("http://en.wikipedia.org/wiki/UTF-8%23Description") !== "http://en.wikipedia.org/wiki/UTF-8%23Description") { 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 70b4de0866..a5517ed7ec 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 @@ -19,7 +19,7 @@ var result = true; for (var p in decodeURI){ if (p === "length") { result = false; - } + } } if (result !== true) { 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 6f3fb2bcd4..c088525b2c 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 @@ -19,7 +19,7 @@ var result = true; for (var p in this){ if (p === "decodeURI") { result = false; - } + } } if (result !== true) { 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 d36c02ea3b..e3789fbdfd 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 @@ -19,7 +19,7 @@ if (decodeURI(object) !== "[object Object]") { 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 {}}}; @@ -59,11 +59,11 @@ try { 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))); -} +} catch (e) { if (e !== "error") { $ERROR('#7.2: var object = {valueOf: function() {return "%5E"}, toString: function() {throw "error"}}; decodeURI(object) throw "error". Actual: ' + (e)); - } + } } //CHECK#8 @@ -71,9 +71,9 @@ try { 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))); -} +} catch (e) { if ((e instanceof TypeError) !== true) { $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURI(object) throw TypeError. Actual: ' + (e)); - } + } }