Changeset 35027 in webkit for trunk/JavaScriptCore/kjs/regexp.cpp

Timestamp:

Jul 6, 2008, 7:49:29 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-07-06 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Second step in broad cleanup effort.

[ File list elided ]

WebCore:

2008-07-06 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Add #include for kjs/protect.h.

• xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::loadRequestAsynchronously):

File:

• trunk/JavaScriptCore/kjs/regexp.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/regexp.cpp

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
  *  Copyright (C) 1999-2001, 2004 Harri Porten ([email protected])
@@ -34 +33 @@
 
 inline RegExp::RegExp(const UString& pattern)
-  : m_pattern(pattern)
-  , m_flagBits(0)
-  , m_constructionError(0)
-  , m_numSubpatterns(0)
+    : m_pattern(pattern)
+    , m_flagBits(0)
+    , m_constructionError(0)
+    , m_numSubpatterns(0)
 {
     m_regExp = jsRegExpCompile(reinterpret_cast<const UChar*>(pattern.data()), pattern.size(),
@@ -49 +48 @@
 
 inline RegExp::RegExp(const UString& pattern, const UString& flags)
-  : m_pattern(pattern)
-  , m_flags(flags)
-  , m_flagBits(0)
-  , m_constructionError(0)
-  , m_numSubpatterns(0)
+    : m_pattern(pattern)
+    , m_flags(flags)
+    , m_flagBits(0)
+    , m_constructionError(0)
+    , m_numSubpatterns(0)
 {
     // NOTE: The global flag is handled on a case-by-case basis by functions like
@@ -72 +71 @@
         multilineOption = JSRegExpMultiline;
     }
-    
+
     m_regExp = jsRegExpCompile(reinterpret_cast<const UChar*>(pattern.data()), pattern.size(),
         ignoreCaseOption, multilineOption, &m_numSubpatterns, &m_constructionError);
@@ -89 +88 @@
 int RegExp::match(const UString& s, int i, OwnArrayPtr<int>* ovector)
 {
-  if (i < 0)
-    i = 0;
-  if (ovector)
-    ovector->clear();
+    if (i < 0)
+        i = 0;
+    if (ovector)
+        ovector->clear();
 
-  if (i > s.size() || s.isNull())
-    return -1;
+    if (i > s.size() || s.isNull())
+        return -1;
 
-  if (!m_regExp)
-    return -1;
+    if (!m_regExp)
+        return -1;
 
-  // Set up the offset vector for the result.
-  // First 2/3 used for result, the last third used by PCRE.
-  int* offsetVector;
-  int offsetVectorSize;
-  int fixedSizeOffsetVector[3];
-  if (!ovector) {
-    offsetVectorSize = 3;
-    offsetVector = fixedSizeOffsetVector;
-  } else {
-    offsetVectorSize = (m_numSubpatterns + 1) * 3;
-    offsetVector = new int [offsetVectorSize];
-    ovector->set(offsetVector);
-  }
+    // Set up the offset vector for the result.
+    // First 2/3 used for result, the last third used by PCRE.
+    int* offsetVector;
+    int offsetVectorSize;
+    int fixedSizeOffsetVector[3];
+    if (!ovector) {
+        offsetVectorSize = 3;
+        offsetVector = fixedSizeOffsetVector;
+    } else {
+        offsetVectorSize = (m_numSubpatterns + 1) * 3;
+        offsetVector = new int [offsetVectorSize];
+        ovector->set(offsetVector);
+    }
 
-  int numMatches = jsRegExpExecute(m_regExp, reinterpret_cast<const UChar*>(s.data()), s.size(), i, offsetVector, offsetVectorSize);
+    int numMatches = jsRegExpExecute(m_regExp, reinterpret_cast<const UChar*>(s.data()), s.size(), i, offsetVector, offsetVectorSize);
 
-  if (numMatches < 0) {
+    if (numMatches < 0) {
 #ifndef NDEBUG
-    if (numMatches != JSRegExpErrorNoMatch)
-      fprintf(stderr, "jsRegExpExecute failed with result %d\n", numMatches);
+        if (numMatches != JSRegExpErrorNoMatch)
+            fprintf(stderr, "jsRegExpExecute failed with result %d\n", numMatches);
 #endif
-    if (ovector)
-      ovector->clear();
-    return -1;
-  }
+        if (ovector)
+            ovector->clear();
+        return -1;
+    }
 
-  return offsetVector[0];
+    return offsetVector[0];
 }