[v8-dev] [v8] r5298 committed - Use consistent types when calling RegExpImpl::IrregexpExecOnce...

[codesite-noreply]

Revision: 5298
Author: sgje...@chromium.org
Date: Wed Aug 18 01:54:25 2010
Log: Use consistent types when calling RegExpImpl::IrregexpExecOnce
Review URL: http://codereview.chromium.org/3167021
http://code.google.com/p/v8/source/detail?r=5298
Modified:
 /branches/bleeding_edge/src/jsregexp.cc
 /branches/bleeding_edge/src/runtime.cc

=======================================
--- /branches/bleeding_edge/src/jsregexp.cc     Tue Aug 17 02:27:51 2010
+++ /branches/bleeding_edge/src/jsregexp.cc     Wed Aug 18 01:54:25 2010
@@ -380,10 +380,11 @@
 }


-RegExpImpl::IrregexpResult RegExpImpl::IrregexpExecOnce(Handle<JSRegExp>  
regexp,
-                                                        Handle<String>  
subject,
-                                                        int index,
-                                                        Vector<int>  
output) {
+RegExpImpl::IrregexpResult RegExpImpl::IrregexpExecOnce(
+    Handle<JSRegExp> regexp,
+    Handle<String> subject,
+    int index,
+    Vector<int32_t> output) {
   Handle<FixedArray> irregexp(FixedArray::cast(regexp->data()));

   ASSERT(index >= 0);
@@ -479,8 +480,8 @@
   OffsetsVector registers(required_registers);

   IrregexpResult res = RegExpImpl::IrregexpExecOnce(
-      jsregexp, subject, previous_index, Vector<int>(registers.vector(),
-                                                     registers.length()));
+      jsregexp, subject, previous_index,  
Vector<int32_t>(registers.vector(),
+                                                          
registers.length()));
   if (res == RE_SUCCESS) {
     int capture_register_count =
         (IrregexpNumberOfCaptures(FixedArray::cast(jsregexp->data())) + 1)  
* 2;
=======================================
--- /branches/bleeding_edge/src/runtime.cc      Mon Aug 16 09:06:46 2010
+++ /branches/bleeding_edge/src/runtime.cc      Wed Aug 18 01:54:25 2010
@@ -3524,7 +3524,7 @@
   if (required_registers < 0) return RegExpImpl::RE_EXCEPTION;

   OffsetsVector registers(required_registers);
-  Vector<int> register_vector(registers.vector(), registers.length());
+  Vector<int32_t> register_vector(registers.vector(), registers.length());
   int subject_length = subject->length();

   for (;;) {  // Break on failure, return on exception.
@@ -3586,7 +3586,7 @@
   if (required_registers < 0) return RegExpImpl::RE_EXCEPTION;

   OffsetsVector registers(required_registers);
-  Vector<int> register_vector(registers.vector(), registers.length());
+  Vector<int32_t> register_vector(registers.vector(), registers.length());

   RegExpImpl::IrregexpResult result =
       RegExpImpl::IrregexpExecOnce(regexp,
@@ -3646,7 +3646,7 @@
       }
       // Swap register vectors, so the last successful match is in
       // prev_register_vector.
-      Vector<int> tmp = prev_register_vector;
+      Vector<int32_t> tmp = prev_register_vector;
       prev_register_vector = register_vector;
       register_vector = tmp;

--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev