Follow jsc in throwing an exception when using test or exec on a

regexp with no input.

Fixed problem with assertThrows.

Deleted test that tests arbitrary limits on the sizes of regular
expressions.
Review URL: http://codereview.chromium.org/13088

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@907 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/messages.js b/src/messages.js
index 531c710..8aa2914 100644 (file)
--- a/src/messages.js
+++ b/src/messages.js
@@ -112,6 +112,7 @@ const kMessages = {
   illegal_continue:             "Illegal continue statement",
   illegal_return:               "Illegal return statement",
   error_loading_debugger:       "Error loading debugger %0",
+  no_input_to_regexp:           "No input to %0",
 };
 
 

diff --git a/src/regexp-delay.js b/src/regexp-delay.js
index e15240a..4baa9cd 100644 (file)
--- a/src/regexp-delay.js
+++ b/src/regexp-delay.js
@@ -163,6 +163,9 @@ function DoRegExpExecGlobal(regexp, string) {
 
 function RegExpExec(string) {
   if (%_ArgumentsLength() == 0) {
+    if (IS_UNDEFINED(regExpInput)) {
+      throw MakeError('no_input_to_regexp', [this]);
+    }
     string = regExpInput;
   }
   var s = ToString(string);
@@ -283,7 +286,7 @@ function RegExpMakeCaptureGetter(n) {
 // the last successful match.
 var regExpCaptures = [0, 0];
 var regExpSubject = '';
-var regExpInput = "";
+var regExpInput;
 
 // -------------------------------------------------------------------
 
@@ -308,13 +311,11 @@ function SetupRegExp() {
   %FunctionSetLength($RegExp.prototype.compile, 1);
 
   // The properties input, $input, and $_ are aliases for each other.  When this
-  // value is set in SpiderMonkey, the value it is set to is coerced to a
-  // string.  We mimic that behavior with a slight difference: in SpiderMonkey
-  // the value of the expression 'RegExp.input = null' (for instance) is the
-  // string "null" (ie, the value after coercion), while in V8 it is the value
-  // null (ie, the value before coercion).
+  // value is set the value it is set to is coerced to a string. 
   // Getter and setter for the input.
-  function RegExpGetInput() { return regExpInput; }
+  function RegExpGetInput() {
+    return IS_UNDEFINED(regExpInput) ? "" : regExpInput;
+  }
   function RegExpSetInput(string) { regExpInput = ToString(string); }
 
   %DefineAccessor($RegExp, 'input', GETTER, RegExpGetInput, DONT_DELETE);

diff --git a/test/mjsunit/mjsunit.js b/test/mjsunit/mjsunit.js
index e7b47cd..1d1e260 100644 (file)
--- a/test/mjsunit/mjsunit.js
+++ b/test/mjsunit/mjsunit.js
@@ -90,12 +90,14 @@ function assertNaN(value, name_opt) {
 
 
 function assertThrows(code) {
+  var threwException = true;
   try {
     eval(code);
-    assertTrue(false, "did not throw exception");
+    threwException = false;
   } catch (e) {
     // Do nothing.
   }
+  if (!threwException) assertTrue(false, "did not throw exception");
 }
 
 

diff --git a/test/mjsunit/nested-repetition-count-overflow.js b/test/mjsunit/nested-repetition-count-overflow.js
deleted file mode 100644 (file)
index 8f040c3..0000000
--- a/test/mjsunit/nested-repetition-count-overflow.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2008 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-var s = "a";
-for (var i = 0; i < 17; i++)
-    s += s;
-
-assertThrows('new RegExp(s);');
-
-assertThrows('/(([ab]){30}){3360}/');
-assertThrows('/(([ab]){30}){0,3360}/');
-assertThrows('/(([ab]){30}){10,3360}/');
-assertThrows('/(([ab]){0,30}){3360}/');
-assertThrows('/(([ab]){0,30}){0,3360}/');
-assertThrows('/(([ab]){0,30}){10,3360}/');
-assertThrows('/(([ab]){10,30}){3360}/');
-assertThrows('/(([ab]){10,30}){0,3360}/');
-assertThrows('/(([ab]){10,30}){10,3360}/');
-assertThrows('/(([ab]){12})(([ab]){65535}){1680}(([ab]){38}){722}([ab]){27}/');

diff --git a/test/mjsunit/regexp-static.js b/test/mjsunit/regexp-static.js
index 73940d7..5db9fe2 100644 (file)
--- a/test/mjsunit/regexp-static.js
+++ b/test/mjsunit/regexp-static.js
@@ -25,6 +25,18 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// Test that we throw exceptions when calling test and exec with no
+// input.  This is not part of the spec, but we do it for
+// compatibility with JSC.
+assertThrows("/a/.test()");
+assertThrows("/a/.exec()");
+
+// Test that we do not throw exceptions once the static RegExp.input
+// field has been set.
+RegExp.input = "a";
+assertDoesNotThrow("/a/.test()");
+assertDoesNotThrow("/a/.exec()");
+
 // Test the (deprecated as of JS 1.5) properties of the RegExp function.
 var re = /((\d+)\.(\d+))/;
 var s = 'abc123.456def';