auto import from //branches/cupcake/...@125939

1 files changed, 135 insertions, 89 deletions

diff --git a/icu/src/main/native/RegExInterface.cpp b/icu/src/main/native/RegExInterface.cpp
index f607d59..afa5cc4 100644
--- a/icu/src/main/native/RegExInterface.cpp
+++ b/icu/src/main/native/RegExInterface.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2007 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+#include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "unicode/uregex.h"
 #include "unicode/utypes.h"
@@ -22,17 +24,31 @@
 
 #include <jni.h>
 #include <JNIHelp.h>
-//#include <android_runtime/AndroidRuntime.h>
 
-static const jchar EMPTY_STRING = 0;
- 
-static void throwPatternSyntaxException(JNIEnv* env, UErrorCode status, jstring pattern, UParseError error)
+static jchar EMPTY_STRING = 0;
+
+/**
+ * A data structure that ties together an ICU regular expression and the
+ * character data it refers to (but does not have a copy of), so we can
+ * manage memory properly.
+ */
+typedef struct RegExDataStruct {
+    // A pointer to the ICU regular expression
+    URegularExpression* regex;
+    // A pointer to (a copy of) the input text that *we* manage
+    jchar* text;
+} RegExData;
+
+static void throwPatternSyntaxException(JNIEnv* env, UErrorCode status,
+                                        jstring pattern, UParseError error)
 {
     jclass clazz = env->FindClass("java/util/regex/PatternSyntaxException");
-    jmethodID method = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;Ljava/lang/String;I)V");
-    
+    jmethodID method = env->GetMethodID(clazz, "<init>",
+                                    "(Ljava/lang/String;Ljava/lang/String;I)V");
+
     jstring message = env->NewStringUTF(u_errorName(status));
-    jthrowable except = (jthrowable)(env->NewObject(clazz, method, message, pattern, error.offset));
+    jthrowable except = (jthrowable)(env->NewObject(clazz, method, message,
+                                                    pattern, error.offset));
     env->Throw(except);
 }
 
@@ -41,102 +57,128 @@ static void throwRuntimeException(JNIEnv* env, UErrorCode status)
     jniThrowException(env, "java/lang/RuntimeException", u_errorName(status));
 }
 
-static URegularExpression* open(JNIEnv* env, jclass clazz, jstring pattern, jint flags)
+static void _close(JNIEnv* env, jclass clazz, RegExData* data)
+{
+    if (data->regex != NULL) {
+        uregex_close(data->regex);
+    }
+
+    if (data->text != NULL && data->text != &EMPTY_STRING) {
+        free(data->text);
+    }
+
+    free(data);
+}
+
+static RegExData* open(JNIEnv* env, jclass clazz, jstring pattern, jint flags)
 {
     flags = flags | UREGEX_ERROR_ON_UNKNOWN_ESCAPES;
-    
+
+    RegExData* data = (RegExData*)calloc(sizeof(RegExData), 1);
+
+    UErrorCode status = U_ZERO_ERROR;
+    UParseError error;
+    error.offset = -1;
+
     jchar const * patternRaw;
     int patternLen = env->GetStringLength(pattern);
     if (patternLen == 0) {
-        patternRaw = &EMPTY_STRING;
-        patternLen = -1;
+        data->regex = uregex_open(&EMPTY_STRING, -1, flags, &error, &status);
     } else {
-        patternRaw = env->GetStringChars(pattern, NULL);
+        jchar const * patternRaw = env->GetStringChars(pattern, NULL);
+        data->regex = uregex_open(patternRaw, patternLen, flags, &error,
+                                  &status);
+        env->ReleaseStringChars(pattern, patternRaw);
     }
 
-    UErrorCode status = U_ZERO_ERROR;
-    UParseError error;
-    error.offset = -1;
-    
-    URegularExpression* result = uregex_open(patternRaw, patternLen, flags, &error, &status);
-    if (patternLen != -1) {
-        env->ReleaseStringChars(pattern, patternRaw);
-    }    
     if (!U_SUCCESS(status)) {
+        _close(env, clazz, data);
         throwPatternSyntaxException(env, status, pattern, error);
+        data = NULL;
     }
-    
-    return result;
+
+    return data;
 }
 
-static URegularExpression* _clone(JNIEnv* env, jclass clazz, jint regex)
+static RegExData* _clone(JNIEnv* env, jclass clazz, RegExData* data)
 {
     UErrorCode status = U_ZERO_ERROR;
 
-    URegularExpression* result = uregex_clone((URegularExpression*)regex, &status);
+    URegularExpression* clonedRegex = uregex_clone(data->regex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
 
+    RegExData* result = (RegExData*)calloc(sizeof(RegExData), 1);
+    result->regex = clonedRegex;
+
     return result;
 }
 
-static void _close(JNIEnv* env, jclass clazz, URegularExpression* regex)
+static void setText(JNIEnv* env, jclass clazz, RegExData* data, jstring text)
 {
-    uregex_close(regex);
-}
+    UErrorCode status = U_ZERO_ERROR;
+
+    uregex_setText(data->regex, &EMPTY_STRING, 0, &status);
+    if (!U_SUCCESS(status)) {
+        throwRuntimeException(env, status);
+        return;
+    }
+
+    if (data->text != NULL && data->text != &EMPTY_STRING) {
+        free(data->text);
+        data->text = NULL;
+    }
 
-static void setText(JNIEnv* env, jclass clazz, URegularExpression* regex, jstring text)
-{
-    jchar const * textRaw;
     int textLen = env->GetStringLength(text);
     if (textLen == 0) {
-        textLen = -1;
-        textRaw = &EMPTY_STRING;
+        data->text = &EMPTY_STRING;
     } else {
-        textRaw = env->GetStringChars(text, NULL);
-    }
-    
-    UErrorCode status = U_ZERO_ERROR;
-    
-    uregex_setText(regex, textRaw, textLen, &status);
-    if (textLen != -1) {
+        jchar const * textRaw = env->GetStringChars(text, NULL);
+        data->text = (jchar*)malloc((textLen + 1) * sizeof(jchar));
+        memcpy(data->text, textRaw, textLen * sizeof(jchar));
+        data->text[textLen] = 0;
         env->ReleaseStringChars(text, textRaw);
-    }    
+    }
+
+    uregex_setText(data->regex, data->text, textLen, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
 }
 
-static jboolean matches(JNIEnv* env, jclass clazz, URegularExpression* regex, jint startIndex)
+static jboolean matches(JNIEnv* env, jclass clazz, RegExData* data,
+                        jint startIndex)
 {
     UErrorCode status = U_ZERO_ERROR;
-    
-    jboolean result = uregex_matches(regex, startIndex, &status);
+
+    jboolean result = uregex_matches(data->regex, startIndex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
-    
+
     return result;
 }
 
-static jboolean lookingAt(JNIEnv* env, jclass clazz, URegularExpression* regex, jint startIndex)
+static jboolean lookingAt(JNIEnv* env, jclass clazz, RegExData* data,
+                          jint startIndex)
 {
     UErrorCode status = U_ZERO_ERROR;
-    
-    jboolean result = uregex_lookingAt(regex, startIndex, &status);
+
+    jboolean result = uregex_lookingAt(data->regex, startIndex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
-    
+
     return result;
 }
 
-static jboolean find(JNIEnv* env, jclass clazz, URegularExpression* regex, jint startIndex)
+static jboolean find(JNIEnv* env, jclass clazz, RegExData* data,
+                     jint startIndex)
 {
     UErrorCode status = U_ZERO_ERROR;
-    
-    jboolean result = uregex_find(regex, startIndex, &status);
+
+    jboolean result = uregex_find(data->regex, startIndex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
@@ -144,23 +186,23 @@ static jboolean find(JNIEnv* env, jclass clazz, URegularExpression* regex, jint
     return result;
 }
 
-static jboolean findNext(JNIEnv* env, jclass clazz, URegularExpression* regex)
+static jboolean findNext(JNIEnv* env, jclass clazz, RegExData* data)
 {
     UErrorCode status = U_ZERO_ERROR;
 
-    jboolean result = uregex_findNext(regex, &status);
+    jboolean result = uregex_findNext(data->regex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
-    
+
     return result;
 }
 
-static jint groupCount(JNIEnv* env, jclass clazz, URegularExpression* regex)
+static jint groupCount(JNIEnv* env, jclass clazz, RegExData* data)
 {
     UErrorCode status = U_ZERO_ERROR;
 
-    jint result = uregex_groupCount(regex, &status);
+    jint result = uregex_groupCount(data->regex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
@@ -168,116 +210,120 @@ static jint groupCount(JNIEnv* env, jclass clazz, URegularExpression* regex)
     return result;
 }
 
-static void startEnd(JNIEnv* env, jclass clazz, URegularExpression* regex, jintArray offsets)
+static void startEnd(JNIEnv* env, jclass clazz, RegExData* data,
+                     jintArray offsets)
 {
     UErrorCode status = U_ZERO_ERROR;
-    
+
     jint * offsetsRaw = env->GetIntArrayElements(offsets, NULL);
 
-    int groupCount = uregex_groupCount(regex, &status);
+    int groupCount = uregex_groupCount(data->regex, &status);
     for (int i = 0; i <= groupCount && U_SUCCESS(status); i++) {
-        offsetsRaw[2 * i + 0] = uregex_start(regex, i, &status);
-        offsetsRaw[2 * i + 1] = uregex_end(regex, i, &status);
+        offsetsRaw[2 * i + 0] = uregex_start(data->regex, i, &status);
+        offsetsRaw[2 * i + 1] = uregex_end(data->regex, i, &status);
     }
-    
+
     env->ReleaseIntArrayElements(offsets, offsetsRaw, 0);
-    
+
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
 }
 
-static void setRegion(JNIEnv* env, jclass clazz, URegularExpression* regex, jint start, jint end)
+static void setRegion(JNIEnv* env, jclass clazz, RegExData* data, jint start,
+                      jint end)
 {
     UErrorCode status = U_ZERO_ERROR;
-    uregex_setRegion(regex, start, end, &status);
+    uregex_setRegion(data->regex, start, end, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
 }
 
-static jint regionStart(JNIEnv* env, jclass clazz, URegularExpression* regex)
+static jint regionStart(JNIEnv* env, jclass clazz, RegExData* data)
 {
     UErrorCode status = U_ZERO_ERROR;
-    int result = uregex_regionStart(regex, &status);
+    int result = uregex_regionStart(data->regex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
     return result;
 }
 
-static jint regionEnd(JNIEnv* env, jclass clazz, URegularExpression* regex)
+static jint regionEnd(JNIEnv* env, jclass clazz, RegExData* data)
 {
     UErrorCode status = U_ZERO_ERROR;
-    int result = uregex_regionEnd(regex, &status);
+    int result = uregex_regionEnd(data->regex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
     return result;
 }
 
-static void useTransparentBounds(JNIEnv* env, jclass clazz, URegularExpression* regex, jboolean value)
+static void useTransparentBounds(JNIEnv* env, jclass clazz, RegExData* data,
+                                 jboolean value)
 {
     UErrorCode status = U_ZERO_ERROR;
-    uregex_useTransparentBounds(regex, value, &status);
+    uregex_useTransparentBounds(data->regex, value, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
 }
 
-static jboolean hasTransparentBounds(JNIEnv* env, jclass clazz, URegularExpression* regex)
+static jboolean hasTransparentBounds(JNIEnv* env, jclass clazz, RegExData* data)
 {
     UErrorCode status = U_ZERO_ERROR;
-    jboolean result = uregex_hasTransparentBounds(regex, &status);
+    jboolean result = uregex_hasTransparentBounds(data->regex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
     return result;
 }
 
-static void useAnchoringBounds(JNIEnv* env, jclass clazz, URegularExpression* regex, jboolean value)
+static void useAnchoringBounds(JNIEnv* env, jclass clazz, RegExData* data,
+                               jboolean value)
 {
     UErrorCode status = U_ZERO_ERROR;
-    uregex_useAnchoringBounds(regex, value, &status);
+    uregex_useAnchoringBounds(data->regex, value, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
 }
 
-static jboolean hasAnchoringBounds(JNIEnv* env, jclass clazz, URegularExpression* regex)
+static jboolean hasAnchoringBounds(JNIEnv* env, jclass clazz, RegExData* data)
 {
     UErrorCode status = U_ZERO_ERROR;
-    jboolean result = uregex_hasAnchoringBounds(regex, &status);
+    jboolean result = uregex_hasAnchoringBounds(data->regex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
     return result;
 }
 
-static jboolean hitEnd(JNIEnv* env, jclass clazz, URegularExpression* regex)
+static jboolean hitEnd(JNIEnv* env, jclass clazz, RegExData* data)
 {
     UErrorCode status = U_ZERO_ERROR;
-    jboolean result = uregex_hitEnd(regex, &status);
+    jboolean result = uregex_hitEnd(data->regex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
     return result;
 }
 
-static jboolean requireEnd(JNIEnv* env, jclass clazz, URegularExpression* regex)
+static jboolean requireEnd(JNIEnv* env, jclass clazz, RegExData* data)
 {
     UErrorCode status = U_ZERO_ERROR;
-    jboolean result = uregex_requireEnd(regex, &status);
+    jboolean result = uregex_requireEnd(data->regex, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
     return result;
 }
 
-static void reset(JNIEnv* env, jclass clazz, URegularExpression* regex, jint position)
+static void reset(JNIEnv* env, jclass clazz, RegExData* data, jint position)
 {
     UErrorCode status = U_ZERO_ERROR;
-    uregex_reset(regex, position, &status);
+    uregex_reset(data->regex, position, &status);
     if (!U_SUCCESS(status)) {
         throwRuntimeException(env, status);
     }
@@ -301,10 +347,10 @@ static JNINativeMethod sMethods[] = {
     { "setRegion",            "(III)V",                 (void*)setRegion  },
     { "regionStart",          "(I)I",                   (void*)regionStart },
     { "regionEnd",            "(I)I",                   (void*)regionEnd  },
-    { "useTransparentBounds", "(IZ)V",                  (void*)useTransparentBounds },
-    { "hasTransparentBounds", "(I)Z",                   (void*)hasTransparentBounds },
-    { "useAnchoringBounds",   "(IZ)V",                  (void*)useAnchoringBounds },
-    { "hasAnchoringBounds",   "(I)Z",                   (void*)hasAnchoringBounds },
+    { "useTransparentBounds", "(IZ)V",            (void*)useTransparentBounds },
+    { "hasTransparentBounds", "(I)Z",             (void*)hasTransparentBounds },
+    { "useAnchoringBounds",   "(IZ)V",            (void*)useAnchoringBounds },
+    { "hasAnchoringBounds",   "(I)Z",             (void*)hasAnchoringBounds },
     { "hitEnd",               "(I)Z",                   (void*)hitEnd },
     { "requireEnd",           "(I)Z",                   (void*)requireEnd },
     { "reset",                "(II)V",                  (void*)reset }
@@ -322,6 +368,6 @@ extern "C" int register_com_ibm_icu4jni_regex_NativeRegEx(JNIEnv* env)
     if (env->RegisterNatives(clazz, sMethods, NELEM(sMethods)) < 0) {
         return -1;
     }
-    
+
     return 0;
 }