| OLD | NEW |
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 // Flags: --harmony-scoping | 28 // Flags: --harmony-scoping |
| 29 | 29 |
| 30 // Test for conflicting variable bindings. | 30 // Test for conflicting variable bindings. |
| 31 | 31 |
| 32 // TODO(ES6): properly activate extended mode | 32 // TODO(ES6): properly activate extended mode |
| 33 "use strict"; | 33 "use strict"; |
| 34 | 34 |
| 35 function CheckException(e) { | 35 function CheckException(e) { |
| 36 var string = e.toString(); | 36 var string = e.toString(); |
| 37 assertTrue(string.indexOf("has already been declared") >= 0 || | 37 assertTrue(string.indexOf("has already been declared") >= 0 || |
| 38 string.indexOf("redeclaration") >= 0); return 'Conflict'; | 38 string.indexOf("redeclaration") >= 0); |
| 39 return 'Conflict'; |
| 39 } | 40 } |
| 40 | 41 |
| 41 | 42 |
| 42 function TestFunction(s,e) { | 43 function TestFunction(s,e) { |
| 43 try { | 44 try { |
| 44 return eval("(function(){" + s + ";return " + e + "})")(); | 45 return eval("(function(){" + s + ";return " + e + "})")(); |
| 45 } catch (x) { | 46 } catch (x) { |
| 46 return CheckException(x); | 47 return CheckException(x); |
| 47 } | 48 } |
| 48 } | 49 } |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 | 126 |
| 126 // Test conflicting catch/var bindings. | 127 // Test conflicting catch/var bindings. |
| 127 for (var v = 0; v < varbinds.length; ++v) { | 128 for (var v = 0; v < varbinds.length; ++v) { |
| 128 TestConflict('try {} catch (x) { ' + varbinds[v] + '; }'); | 129 TestConflict('try {} catch (x) { ' + varbinds[v] + '; }'); |
| 129 } | 130 } |
| 130 | 131 |
| 131 // Test conflicting parameter/var bindings. | 132 // Test conflicting parameter/var bindings. |
| 132 for (var v = 0; v < varbinds.length; ++v) { | 133 for (var v = 0; v < varbinds.length; ++v) { |
| 133 TestNoConflict('(function (x) { ' + varbinds[v] + '; })()'); | 134 TestNoConflict('(function (x) { ' + varbinds[v] + '; })()'); |
| 134 } | 135 } |
| OLD | NEW |